This commit was manufactured by cvs2svn to create tag 'v20080423'.
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/.classpath b/bundles/org.eclipse.wst.xsl.debug.ui/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.wst.xsl.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/.cvsignore b/bundles/org.eclipse.wst.xsl.debug.ui/.cvsignore
deleted file mode 100644
index ac6029b..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-javaCompiler...args
-build.xml
-@dot
-temp.folder
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/.project b/bundles/org.eclipse.wst.xsl.debug.ui/.project
deleted file mode 100644
index cf9d0b2..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.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/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 0a7bb6d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jan 03 22:24:01 EST 2008
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 863067b..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri Jan 04 01:05:33 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fdd8568..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Fri Jan 04 09:04:43 EST 2008
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.missing-bundle-classpath-entries=0
-compilers.p.missing-packages=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=1
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 0bd282d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsl.debug.ui;singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.jdt.debug.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.xsl.launching;bundle-version="[0.5.0,1.0.0)",
- org.eclipse.wst.xsl.debug;bundle-version="[0.5.0,1.0.0)",
- org.eclipse.ui.console;bundle-version="[3.2.0,4.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/about.html b/bundles/org.eclipse.wst.xsl.debug.ui/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</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/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</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>
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/build.properties b/bundles/org.eclipse.wst.xsl.debug.ui/build.properties
deleted file mode 100644
index 878da21..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               icons/
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/icons/brkp_obj.gif b/bundles/org.eclipse.wst.xsl.debug.ui/icons/brkp_obj.gif
deleted file mode 100644
index a831fe7..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/icons/brkp_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/icons/localvariable_obj.gif b/bundles/org.eclipse.wst.xsl.debug.ui/icons/localvariable_obj.gif
deleted file mode 100644
index 3244b26..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/icons/localvariable_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/icons/sample.gif b/bundles/org.eclipse.wst.xsl.debug.ui/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/icons/sample.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/plugin.properties b/bundles/org.eclipse.wst.xsl.debug.ui/plugin.properties
deleted file mode 100644
index 9b951fb..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.debug.ui
-Bundle-Name.0 = XSL Debug UI Plug-in (Incubating)
-page.name.1 = Installed Processors
-page.name.2 = Features
-page.name.3 = Output Properties
-launchMode.description.0 = Create a configuration to debug an XSLT transformation
-launchMode.description.1 = Create a configuration to run an XSLT transformation
-context.description.0 = Context for debugging XSLT
-context.name.0 = XSLT Debugging
-shortcut.label.0 = XSL Transformation
-shortcut.label.1 = XSLT Transformation
-Bundle-Vendor.0 = Eclipse.org
-description.description.0 = Run an XSLT transformation using the selected file(s)
-description.description.1 = Debug an XSLT transformation using the selected file(s)
-description.description.2 = Profile an XSLT transformation using the selected file(s)
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/plugin.xml b/bundles/org.eclipse.wst.xsl.debug.ui/plugin.xml
deleted file mode 100644
index 47cc61c..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/plugin.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-	<extension point="org.eclipse.ui.preferencePages">
-		<page
-			category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
-			class="org.eclipse.wst.xsl.internal.debug.ui.preferences.ProcessorsPreferencePage"
-			id="org.eclipse.wst.xsl.launching.ui.preferences.ProcessorPreferencePage"
-			name="%page.name.1">
-		</page>
-		<page
-			category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
-			class="org.eclipse.wst.xsl.internal.debug.ui.preferences.FeaturesPreferencePage"
-			id="org.eclipse.wst.xsl.debug.ui.page1" name="%page.name.2" />
-		<page
-			category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
-			class="org.eclipse.wst.xsl.internal.debug.ui.preferences.OutputPreferencePage"
-			id="org.eclipse.wst.xsl.debug.ui.output" name="%page.name.3" />
-	</extension>
-	
-	<extension point="org.eclipse.ui.perspectiveExtensions">
-		<perspectiveExtension
-			targetID="org.eclipse.wst.xml.perspective">
-			<actionSet id="org.eclipse.debug.ui.debugActionSet" />
-			<actionSet id="org.eclipse.debug.ui.launchActionSet" />
-			<actionSet id="org.eclipse.debug.ui.breakpointActionSet" />
-			<actionSet id="org.eclipse.debug.ui.profileActionSet" />
-		</perspectiveExtension>
-	</extension>
-	
-	<extension
-		point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-		<launchConfigurationTypeImage icon="icons/sample.gif"
-			configTypeID="org.eclipse.wst.xsl.launching.launchConfigurationType"
-			id="org.eclipse.wst.xsl.internal.debug.ui.launchConfigurationTypeImage" />
-	</extension>
-
-	<extension
-		point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-		<launchConfigurationTabGroup
-			class="org.eclipse.wst.xsl.internal.debug.ui.XSLTTabGroup"
-			id="org.eclipse.wst.xsl.internal.debug.ui.launchConfigurationTabGroup.xslt"
-			type="org.eclipse.wst.xsl.launching.launchConfigurationType">
-			<launchMode description="%launchMode.description.0"
-				mode="debug" perspective="org.eclipse.debug.ui.DebugPerspective" />
-			<launchMode description="%launchMode.description.1"
-				mode="run" perspective="org.eclipse.wst.xml.perspective" />
-		</launchConfigurationTabGroup>
-	</extension>
-	
-	<extension point="org.eclipse.ui.contexts">
-		<context description="%context.description.0"
-			id="org.eclipse.wst.xsl.debug.ui.context" name="%context.name.0"
-			parentId="org.eclipse.debug.ui.debugging">
-		</context>
-	</extension>
-
-	<extension point="org.eclipse.debug.ui.debugModelPresentations">
-		<debugModelPresentation
-			class="org.eclipse.wst.xsl.internal.debug.ui.model.XSLModelPresentation"
-			id="org.eclipse.wst.xsl.launching.XSLDebugModel">
-		</debugModelPresentation>
-	</extension>
-
-	<extension point="org.eclipse.debug.ui.launchShortcuts">
-		<shortcut
-			class="org.eclipse.wst.xsl.internal.debug.ui.XSLLaunchShortcut"
-			id="org.eclipse.wst.xsl.debug.ui.launchshortcut"
-			label="%shortcut.label.0" modes="run, debug, profile">
-			<contextualLaunch>
-				<enablement>
-					<with variable="selection">
-						<iterate>
-							<adapt
-								type="org.eclipse.core.resources.IFile">
-								<or>
-									<test
-										property="org.eclipse.core.resources.contentTypeId"
-										value="org.eclipse.core.runtime.xml" />
-									<test
-										property="org.eclipse.core.resources.contentTypeId"
-										value="org.eclipse.wst.xml.core.xmlsource" />
-									<test
-										property="org.eclipse.core.resources.contentTypeId"
-										value="org.eclipse.wst.xml.core.xslsource" />
-								</or>
-							</adapt>
-						</iterate>
-					</with>
-				</enablement>
-			</contextualLaunch>
-		   <description
-		         description="%description.description.0"
-		         mode="run">
-		   </description>
-		   <description
-		         description="%description.description.1"
-		         mode="debug">
-		   </description>
-		   <description
-		         description="%description.description.2"
-		         mode="profile">
-		   </description>
-		</shortcut>
-	</extension>
-	
-	<extension point="org.eclipse.debug.ui.debugModelContextBindings">
-		<modelContextBinding
-			contextId="org.eclipse.wst.xsl.debug.ui.context"
-			debugModelId="org.eclipse.wst.xsl.launching.XSLDebugModel">
-		</modelContextBinding>
-	</extension>
-	
-	<extension point="org.eclipse.debug.ui.contextViewBindings">
-		<contextViewBinding autoOpen="true"
-			contextId="org.eclipse.wst.xsl.debug.ui.context"
-			viewId="org.eclipse.wst.xml.ui.xpath.view">
-		</contextViewBinding>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.ui.breakpoint">
-		<breakpointContribution
-			id="org.eclipse.wst.xsl.debug.ui.providers">
-			<provider contentTypes="org.eclipse.wst.xml.core.xslsource"
-				class="org.eclipse.wst.xsl.internal.debug.ui.breakpoint.XSLBreakpointProvider:*xsl,*xslt"
-				id="org.eclipse.wst.xsl.debug.ui.XSLBreakpointProvider" />
-				<!-- TODO add this back in when we can do something with breakpoints on XML files -->
-<!--			<provider contentTypes="org.eclipse.wst.xml.core.xslsource,org.eclipse.wst.xml.core.xmlsource,org.eclipse.core.runtime.xml"
-				class="org.eclipse.wst.xsl.internal.debug.ui.breakpoint.XSLBreakpointProvider:*xsl,*xslt,*xml"
-				id="org.eclipse.wst.xsl.debug.ui.XSLBreakpointProvider" /> -->
-		</breakpointContribution>
-	</extension>
-
-	<extension point="org.eclipse.debug.ui.consoleLineTrackers">
-		<consoleLineTracker
-			id="org.eclipse.wst.xsl.internal.debug.ui.XSLConsoleLineTracker"
-			class="org.eclipse.wst.xsl.internal.debug.ui.XSLConsoleLineTracker"
-			processType="java">
-		</consoleLineTracker>
-	</extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/AbstractTableBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/AbstractTableBlock.java
deleted file mode 100644
index e121c88..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/AbstractTableBlock.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.swt.widgets.Table;
-
-public abstract class AbstractTableBlock extends AbstractLaunchConfigurationTab
-{
-	private int fSortColumn;
-
-	protected abstract Table getTable();
-
-	protected abstract IDialogSettings getDialogSettings();
-
-	protected abstract String getQualifier();
-
-	protected void setSortColumn(int column)
-	{
-		fSortColumn = column;
-	}
-
-	/**
-	 * Persist table settings into the give dialog store, prefixed with the
-	 * given key.
-	 */
-	public void saveColumnSettings()
-	{
-		int columnCount = getTable().getColumnCount();
-		for (int i = 0; i < columnCount; i++)
-		{
-			getDialogSettings().put(getQualifier() + ".columnWidth" + i, getTable().getColumn(i).getWidth()); //$NON-NLS-1$
-		}
-		getDialogSettings().put(getQualifier() + ".sortColumn", fSortColumn); //$NON-NLS-1$
-	}
-
-	/**
-	 * Restore table settings from the given dialog store using the given key.
-	 * 
-	 * @param widths
-	 */
-	public void restoreColumnSettings()
-	{
-		getTable().layout(true);
-		restoreColumnWidths(getDialogSettings(), getQualifier());
-		int col = 0;
-		try
-		{
-			col = getDialogSettings().getInt(getQualifier() + ".sortColumn"); //$NON-NLS-1$
-		}
-		catch (NumberFormatException e)
-		{
-			col = 1;
-		}
-		setSortColumn(col);
-	}
-
-	private void restoreColumnWidths(IDialogSettings settings, String qualifier)
-	{
-		int columnCount = getTable().getColumnCount();
-		for (int i = 0; i < columnCount; i++)
-		{
-			int width = -1;
-			try
-			{
-				width = settings.getInt(qualifier + ".columnWidth" + i); //$NON-NLS-1$
-			}
-			catch (NumberFormatException e)
-			{
-			}
-
-			if (width > 0)
-				getTable().getColumn(i).setWidth(width);
-		}
-	}
-
-	@Override
-	public void dispose()
-	{
-		if (getTable() != null && !getTable().isDisposed())
-			saveColumnSettings();
-		super.dispose();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/Messages.java
deleted file mode 100644
index f543dc8..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.internal.debug.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.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/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/ResourceSelectionBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/ResourceSelectionBlock.java
deleted file mode 100644
index a108cc2..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/ResourceSelectionBlock.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-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.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.debug.ui.StringVariableSelectionDialog;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-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.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.views.navigator.ResourceComparator;
-
-public abstract class ResourceSelectionBlock extends AbstractLaunchConfigurationTab
-{
-	protected static final int ERROR_DIRECTORY_NOT_SPECIFIED = 1;
-	protected static final int ERROR_DIRECTORY_DOES_NOT_EXIST = 2;
-	protected static final int GROUP_NAME = 3;
-	protected static final int USE_DEFAULT_RADIO = 4;
-	protected static final int USE_OTHER_RADIO = 5;
-	protected static final int DIRECTORY_DIALOG_MESSAGE = 6;
-	protected static final int WORKSPACE_DIALOG_MESSAGE = 7;
-	protected static final int VARIABLES_BUTTON = 8;
-	protected static final int FILE_SYSTEM_BUTTON = 9;
-	protected static final int WORKSPACE_BUTTON = 10;
-	protected static final int WORKSPACE_DIALOG_TITLE = 11;
-
-	protected Button fWorkspaceButton;
-	protected Button fFileSystemButton;
-	protected Button fVariablesButton;
-	protected Button useDefaultCheckButton;
-	protected Text resourceText;
-	protected WidgetListener widgetListener = new WidgetListener();
-	private ILaunchConfiguration fLaunchConfiguration;
-	protected final boolean showDefault;
-	private final int resourceType;
-	private final boolean mustExist;
-	protected boolean required;
-	protected String defaultOutputFile;
-	protected String outputFile;
-	protected String fileLabel = Messages.getString("ResourceSelectionBlock.0"); //$NON-NLS-1$
-
-	private final ISelectionStatusValidator validator = new ISelectionStatusValidator()
-	{
-		public IStatus validate(Object[] selection)
-		{
-			if (selection.length == 0)
-			{
-				return new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, 0, "", null);  //$NON-NLS-1$
-			}
-			for (int i = 0; i < selection.length; i++)
-			{
-				if (resourceType == IResource.FOLDER && !(selection[i] instanceof IFolder))
-					return new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, 0, "", null);  //$NON-NLS-1$
-				else if (resourceType == IResource.FILE && !(selection[i] instanceof IFile))
-					return new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, 0, "", null);  //$NON-NLS-1$
-			}
-			return new Status(IStatus.OK, XSLDebugUIPlugin.PLUGIN_ID, 0, "", null);  //$NON-NLS-1$
-		}
-	};
-
-	class WidgetListener extends SelectionAdapter implements ModifyListener
-	{
-		public void modifyText(ModifyEvent e)
-		{
-			textModified();
-			updateLaunchConfigurationDialog();
-		}
-
-		@Override
-		public void widgetSelected(SelectionEvent e)
-		{
-			Object source = e.getSource();
-			if (source == fWorkspaceButton)
-			{
-				handleWorkspaceResourceBrowseButtonSelected();
-			}
-			else if (source == fFileSystemButton)
-			{
-				handleExternalResourceBrowseButtonSelected();
-			}
-			else if (source == fVariablesButton)
-			{
-				handleResourceVariablesButtonSelected();
-			}
-			else if (source == useDefaultCheckButton)
-			{
-				updateResourceText(useDefaultCheckButton.getSelection());
-			}
-		}
-	}
-
-	public ResourceSelectionBlock()
-	{
-		this(true);
-	}
-
-	public ResourceSelectionBlock(boolean showDefault)
-	{
-		this(IResource.FOLDER, showDefault);
-	}
-
-	public ResourceSelectionBlock(int resourceType, boolean showDefault)
-	{
-		this(resourceType, showDefault, true);
-	}
-
-	public ResourceSelectionBlock(int resourceType, boolean showDefault, boolean required)
-	{
-		this(resourceType, showDefault, required, true);
-	}
-
-	public ResourceSelectionBlock(int resourceType, boolean showDefault, boolean required, boolean mustExist)
-	{
-		super();
-		this.showDefault = showDefault;
-		this.resourceType = resourceType;
-		this.required = required;
-		this.mustExist = mustExist;
-	}
-
-	public void createControl(Composite parent)
-	{
-		Composite group = createContainer(parent);
-		setControl(group);
-		createContents(group);
-	}
-
-	protected Composite createContainer(Composite parent)
-	{
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(getMessage(GROUP_NAME));
-		// TODO PlatformUI.getWorkbench().getHelpSystem().setHelp...
-		GridLayout groupLayout = new GridLayout();
-		groupLayout.numColumns = 2;
-		groupLayout.makeColumnsEqualWidth = false;
-		group.setLayout(groupLayout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		group.setLayoutData(gd);
-		group.setFont(parent.getFont());
-		return group;
-	}
-
-	protected void createContents(Composite parent)
-	{
-		createCheckboxAndText(parent);
-		createButtons(parent);
-	}
-
-	protected void createCheckboxAndText(Composite parent)
-	{
-		if (showDefault)
-		{
-			useDefaultCheckButton = createCheckButton(parent, getMessage(USE_DEFAULT_RADIO));
-			GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-			gd.horizontalSpan = 2;
-			useDefaultCheckButton.setLayoutData(gd);
-			useDefaultCheckButton.addSelectionListener(widgetListener);
-		}
-
-		Composite specificFileComp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginWidth = 0;
-		if (showDefault)
-			layout.marginLeft = 20;
-		else
-			layout.marginLeft = 0;
-		layout.marginHeight = 0;
-		specificFileComp.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		specificFileComp.setLayoutData(gd);
-
-		if (showDefault)
-		{
-			Label label = new Label(specificFileComp, SWT.NONE);
-			label.setText(fileLabel);
-		}
-
-		resourceText = new Text(specificFileComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = showDefault ? 1 : 2;
-		resourceText.setLayoutData(gd);
-		resourceText.setFont(parent.getFont());
-		resourceText.addModifyListener(widgetListener);
-	}
-
-	protected void createButtons(Composite parent)
-	{
-		// filler
-		new Label(parent, SWT.NONE);
-
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(3, false);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttonComp.setLayout(layout);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		gd.horizontalSpan = 1;
-		buttonComp.setLayoutData(gd);
-		buttonComp.setFont(parent.getFont());
-
-		fWorkspaceButton = createPushButton(buttonComp, getMessage(WORKSPACE_BUTTON), null);
-		fWorkspaceButton.addSelectionListener(widgetListener);
-
-		fFileSystemButton = createPushButton(buttonComp, getMessage(FILE_SYSTEM_BUTTON), null);
-		fFileSystemButton.addSelectionListener(widgetListener);
-
-		fVariablesButton = createPushButton(buttonComp, getMessage(VARIABLES_BUTTON), null);
-		fVariablesButton.addSelectionListener(widgetListener);
-	}
-
-	protected void updateResourceText(boolean useDefault)
-	{
-		if (useDefault)
-		{
-			resourceText.setText(defaultOutputFile == null ? "" : defaultOutputFile); //$NON-NLS-1$
-		}
-		else
-		{
-			resourceText.setText(outputFile == null ? "" : outputFile); //$NON-NLS-1$
-		}
-		resourceText.setEnabled(!useDefault);
-		fFileSystemButton.setEnabled(!useDefault);
-		fVariablesButton.setEnabled(!useDefault);
-		fWorkspaceButton.setEnabled(!useDefault);
-	}
-
-	@Override
-	public void dispose()
-	{
-	}
-
-	protected void handleExternalResourceBrowseButtonSelected()
-	{
-		String currentWorkingDir = getText();
-		String selected = null;
-		if (resourceType == IResource.FOLDER)
-		{
-			DirectoryDialog dialog = new DirectoryDialog(getShell());
-			dialog.setMessage(getMessage(DIRECTORY_DIALOG_MESSAGE));
-			if (!currentWorkingDir.trim().equals("")) //$NON-NLS-1$
-			{
-				File path = new File(currentWorkingDir);
-				if (path.exists())
-				{
-					dialog.setFilterPath(currentWorkingDir);
-				}
-			}
-			selected = dialog.open();
-		}
-		else
-		{
-			FileDialog dialog = new FileDialog(getShell());
-			if (!currentWorkingDir.trim().equals("")) //$NON-NLS-1$
-			{
-				File path = new File(currentWorkingDir);
-				if (path.exists())
-				{
-					dialog.setFilterPath(currentWorkingDir);
-				}
-			}
-			String[] fileExtensions = getFileExtensions();
-			if (fileExtensions != null)
-			{
-				String[] filterExtensions = new String[fileExtensions.length];
-				for (int i = 0; i < fileExtensions.length; i++)
-				{
-					String ext = fileExtensions[i];
-					filterExtensions[i] = "*." + ext; //$NON-NLS-1$
-				}
-				dialog.setFilterExtensions(filterExtensions);
-			}
-			selected = dialog.open();
-		}
-		if (selected != null)
-		{
-			resourceText.setText(selected);
-		}
-	}
-
-	protected String[] getFileExtensions()
-	{
-		return null;
-	}
-
-	protected void handleWorkspaceResourceBrowseButtonSelected()
-	{
-		IPath path = openWorkspaceResourceDialog();
-		if (path != null)
-			setText("${workspace_loc:" + path.toString() + "}");   //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	protected IPath openWorkspaceResourceDialog()
-	{
-		IResource currentResource = getResource();
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-		dialog.setTitle(getMessage(WORKSPACE_DIALOG_TITLE));
-		dialog.setMessage(getMessage(WORKSPACE_DIALOG_MESSAGE));
-		dialog.setValidator(validator);
-		dialog.addFilter(new ViewerFilter()
-		{
-			@Override
-			public boolean select(Viewer viewer, Object parentElement, Object element)
-			{
-				if (element instanceof IContainer)
-					return true;
-				if (resourceType != IResource.FILE)
-					return false;
-				IFile file = (IFile) element;
-				String[] extensions = getFileExtensions();
-				if (extensions == null)
-					return true;
-				String fileExt = file.getFileExtension();
-				if (fileExt != null)
-				{
-					for (String ext : extensions)
-					{
-						if (fileExt.equalsIgnoreCase(ext))
-							return true;
-					}
-				}
-				return false;
-			}
-		});
-		ViewerFilter filter = getResourceFilter();
-		if (filter != null)
-			dialog.addFilter(filter);
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-		dialog.setInitialSelection(currentResource);
-		dialog.setComparator(new ResourceComparator(ResourceComparator.NAME));
-		dialog.setAllowMultiple(false);
-
-		if (dialog.open() == Window.OK)
-		{
-			Object[] elements = dialog.getResult();
-			if (elements.length > 0)
-				return ((IResource) elements[0]).getFullPath();
-		}
-		return null;
-	}
-
-	protected ViewerFilter getResourceFilter()
-	{
-		return null;
-	}
-
-	/**
-	 * Returns the selected workspace container,or <code>null</code>
-	 */
-	protected IResource getResource()
-	{
-		String path = getText();
-		if (path.length() > 0)
-		{
-			IResource res = null;
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			if (path.startsWith("${workspace_loc:"))  //$NON-NLS-1$
-			{
-				IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-				try
-				{
-					path = manager.performStringSubstitution(path, false);
-					if (resourceType == IResource.FOLDER)
-					{
-						IContainer[] containers = root.findContainersForLocation(new Path(path));
-						if (containers.length > 0)
-						{
-							res = containers[0];
-						}
-					}
-					else if (resourceType == IResource.FILE)
-					{
-						IFile[] files = root.findFilesForLocation(new Path(path));
-						if (files.length > 0)
-						{
-							res = files[0];
-						}
-					}
-				}
-				catch (CoreException e)
-				{
-				}
-			}
-			else
-			{
-				res = root.findMember(path);
-			}
-			return res;
-		}
-		return null;
-	}
-
-	protected void handleResourceVariablesButtonSelected()
-	{
-		StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell());
-		dialog.open();
-		String variableText = dialog.getVariableExpression();
-		if (variableText != null)
-		{
-			resourceText.insert(variableText);
-		}
-	}
-
-	protected abstract void setDefaultResource();
-
-	@Override
-	public boolean isValid(ILaunchConfiguration config)
-	{
-		setErrorMessage(null);
-		setMessage(null);
-		// if variables are present, we cannot resolve the directory
-		String workingDirPath = getText();
-		if (workingDirPath.indexOf("${") >= 0) //$NON-NLS-1$
-		{
-			IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-			try
-			{
-				manager.validateStringVariables(workingDirPath);
-				if (mustExist)
-				{
-					String path = manager.performStringSubstitution(workingDirPath);
-					validateResource(path);
-				}
-			}
-			catch (CoreException e)
-			{
-				setErrorMessage(e.getMessage());
-				return false;
-			}
-		}
-		else if (mustExist && workingDirPath.length() > 0)
-		{
-			return validateResource(workingDirPath);
-		}
-		else if (required && workingDirPath.length() == 0)
-		{
-			setErrorMessage(getMessage(ERROR_DIRECTORY_NOT_SPECIFIED));
-		}
-		return true;
-	}
-
-	protected boolean validateResource(String workingDirPath)
-	{
-		if (resourceType == IResource.FOLDER)
-		{
-			IContainer container = (IContainer) getResource();
-			if (container == null)
-			{
-				File dir = new File(workingDirPath);
-				if (dir.isDirectory())
-				{
-					return true;
-				}
-			}
-			else
-				return true;
-		}
-		else if (resourceType == IResource.FILE)
-		{
-			File file = new File(workingDirPath);
-			if (file.isFile())
-			{
-				return true;
-			}
-		}
-		setErrorMessage(getMessage(ERROR_DIRECTORY_DOES_NOT_EXIST));
-		return false;
-	}
-
-	protected abstract String getMessage(int type);
-
-	protected void textModified()
-	{
-	}
-
-	protected String getText()
-	{
-		return resourceText.getText().trim();
-	}
-
-	protected void setText(String text)
-	{
-		resourceText.setText(text);
-	}
-
-	protected void setLaunchConfiguration(ILaunchConfiguration config)
-	{
-		fLaunchConfiguration = config;
-	}
-
-	protected ILaunchConfiguration getLaunchConfiguration()
-	{
-		return fLaunchConfiguration;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLConsoleLineTracker.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLConsoleLineTracker.java
deleted file mode 100644
index 012d7ec..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLConsoleLineTracker.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005-2007 Orangevolt (www.orangevolt.com)
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Lars Gersmann (www.orangevolt.com) 
- *     Doug Satchwell (http://www.chasetechnology.co.uk) 
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.internal.debug.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLDecoder;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.ui.console.IConsole;
-import org.eclipse.debug.ui.console.IConsoleLineTracker;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.swt.program.Program;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.console.IHyperlink;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * <p>
- * A console line tracker for XSL launches.
- * </p>
- * 
- * <p>
- * Note: It is actually configured to run for all Java launches in
- * <code>plugin.xml</code>, but it only really becomes enabled when the
- * launch configuration type is
- * <code>org.eclipse.wst.xsl.launching.launchConfigurationType</code>.
- * </p>
- */
-public class XSLConsoleLineTracker implements IConsoleLineTracker
-{
-	private IConsole console;
-	private boolean enabled;
-
-	public void dispose()
-	{
-		console = null;
-	}
-
-	public void init(IConsole console)
-	{
-		this.console = console;
-		this.enabled = false;
-		try
-		{
-			String launchTypeId = console.getProcess().getLaunch().getLaunchConfiguration().getType().getIdentifier();
-			this.enabled = "org.eclipse.wst.xsl.launching.launchConfigurationType".equals(launchTypeId); //$NON-NLS-1$
-		}
-		catch (CoreException e)
-		{
-			// do nothing
-		}
-	}
-
-	public void lineAppended(IRegion line)
-	{
-		if (!enabled)
-			return;
-
-		int lineOffset = line.getOffset();
-		int lineLength = line.getLength();
-		try
-		{
-			String text = console.getDocument().get(lineOffset, lineLength);
-			int i;
-			if ((i = text.indexOf("file:/")) != -1 || (i = text.indexOf("http://")) != -1 //$NON-NLS-1$ //$NON-NLS-2$
-					|| (i = text.indexOf("https://")) != -1 || (i = text.indexOf("ftp://")) != -1) //$NON-NLS-1$ //$NON-NLS-2$
-			{
-				int v = i + 9;
-				StringBuffer sb = new StringBuffer(text.substring(i, v));
-				for (; v < text.length(); v++)
-				{
-					char c = text.charAt(v);
-					if (c != ' ' && c != ':' && c != ';' && c != '{' && c != '}' && c != '[' && c != ']' && c != '(' && c != ')')
-					{
-						sb.append(c);
-					}
-					else
-					{
-						break;
-					}
-				}
-
-				ExternalFileConsoleHyperLink link = new ExternalFileConsoleHyperLink(sb.toString(), -1);
-				console.addLink(link, lineOffset + i, v - i);
-			}
-		}
-		catch (BadLocationException e)
-		{
-			// do nothing
-		}
-	}
-
-	private static class ExternalFileConsoleHyperLink implements IHyperlink
-	{
-		private final int fLineNumber;
-		private final String uri;
-
-		public ExternalFileConsoleHyperLink(String uri, int lineNumber)
-		{
-			this.fLineNumber = lineNumber;
-			this.uri = uri;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkEntered()
-		 */
-		public void linkEntered()
-		{
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkExited()
-		 */
-		public void linkExited()
-		{
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.debug.ui.console.IConsoleHyperlink#linkActivated()
-		 */
-		public void linkActivated()
-		{
-			URL url = null;
-			try
-			{
-				url = new URL(uri);
-			}
-			catch (MalformedURLException e)
-			{
-				return;
-			}
-			if ("file".equals(url.getProtocol())) //$NON-NLS-1$
-			{
-				String path = URLDecoder.decode(url.getPath());
-				Path fExternalPath = new Path(path);
-				IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(fExternalPath);
-				if (files.length > 0)
-				{
-					for (int i = 0; i < files.length; i++)
-					{
-						IFile curr = files[0];
-						IEditorPart part;
-						try
-						{
-							part = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), curr);
-							if (part != null && fLineNumber != -1)
-							{
-								if (part instanceof ITextEditor)
-								{
-									try
-									{
-										revealLine((ITextEditor) part, fLineNumber);
-									}
-									catch (BadLocationException e)
-									{
-										// ignore
-									}
-								}
-								return;
-							}
-						}
-						catch (PartInitException e)
-						{
-							// ignore
-						}
-					}
-				}
-			}
-			else
-			{
-				Program.launch(url.toExternalForm());
-			}
-		}
-
-		private void revealLine(ITextEditor editor, int lineNumber) throws BadLocationException
-		{
-			IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput());
-			IRegion region = document.getLineInformation(lineNumber - 1);
-			editor.selectAndReveal(region.getOffset(), 0);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLDebugUIConstants.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLDebugUIConstants.java
deleted file mode 100644
index 823641d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLDebugUIConstants.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui;
-
-
-public class XSLDebugUIConstants
-{
-	private static final String PREFIX = XSLDebugUIPlugin.PLUGIN_ID + '.';
-	public static final String PROCESSOR_DETAILS_DIALOG = PREFIX + "PROCESSOR_DETAILS_DIALOG"; //$NON-NLS-1$
-	public static final String PROCESSOR_OUTPUT_PROPERTIES_BLOCK = PREFIX + "PROCESSOR_OUTPUT_PROPERTIES_BLOCK"; //$NON-NLS-1$
-	public static final String MAIN_PARAMATERS_BLOCK = PREFIX + "MAIN_PARAMATERS_BLOCK"; //$NON-NLS-1$
-	public static final String MAIN_TRANSFORMS_BLOCK = PREFIX + "MAIN_TRANSFORMS_BLOCK"; //$NON-NLS-1$
-	public static final String FEATURES_BLOCK = PREFIX + "FEATURES_BLOCK"; //$NON-NLS-1$
-	public static final String OUTPUT_BLOCK = PREFIX + "OUTPUT_BLOCK"; //$NON-NLS-1$
-	public static final String FEATURES_LAUNCH_BLOCK = PREFIX + "FEATURES_LAUNCH_BLOCK"; //$NON-NLS-1$
-
-	public static final String XSL_EDITOR_ID = "org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLDebugUIPlugin.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLDebugUIPlugin.java
deleted file mode 100644
index c25f3ce..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLDebugUIPlugin.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.wst.xsl.internal.debug.ui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.IPreferenceNode;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.preference.PreferenceManager;
-import org.eclipse.jface.preference.PreferenceNode;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Display;
-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 activator class controls the plug-in life cycle
- */
-public class XSLDebugUIPlugin extends AbstractUIPlugin
-{
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.xsl.debug.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static XSLDebugUIPlugin plugin;
-
-	public XSLDebugUIPlugin()
-	{
-		plugin = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception
-	{
-		super.start(context);
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception
-	{
-		plugin = null;
-		super.stop(context);
-	}
-
-	public static XSLDebugUIPlugin getDefault()
-	{
-		return plugin;
-	}
-
-	public static ImageDescriptor getImageDescriptor(String path)
-	{
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-	public static void showPreferencePage(String id, IPreferencePage page)
-	{
-		final IPreferenceNode targetNode = new PreferenceNode(id, page);
-
-		PreferenceManager manager = new PreferenceManager();
-		manager.addToRoot(targetNode);
-		final PreferenceDialog dialog = new PreferenceDialog(XSLDebugUIPlugin.getActiveWorkbenchShell(), manager);
-		final boolean[] result = new boolean[]
-		{ false };
-		BusyIndicator.showWhile(XSLDebugUIPlugin.getStandardDisplay(), new Runnable()
-		{
-			public void run()
-			{
-				dialog.create();
-				dialog.setMessage(targetNode.getLabelText());
-				result[0] = (dialog.open() == Window.OK);
-			}
-		});
-	}
-
-	public static Display getStandardDisplay()
-	{
-		Display display;
-		display = Display.getCurrent();
-		if (display == null)
-			display = Display.getDefault();
-		return display;
-	}
-
-	public static IWorkbenchWindow getActiveWorkbenchWindow()
-	{
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	public static Shell getActiveWorkbenchShell()
-	{
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		if (window != null)
-		{
-			return window.getShell();
-		}
-		return null;
-	}
-
-	public static IWorkbenchPage getActivePage()
-	{
-		IWorkbenchWindow w = getActiveWorkbenchWindow();
-		if (w != null)
-		{
-			return w.getActivePage();
-		}
-		return null;
-	}
-
-	public static void log(Exception e)
-	{
-		getDefault().getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, 0, "", e)); //$NON-NLS-1$
-	}
-
-	public static void log(CoreException e)
-	{
-		getDefault().getLog().log(e.getStatus());
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchConfigurationTab.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchConfigurationTab.java
deleted file mode 100644
index 144a41a..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchConfigurationTab.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-public abstract class XSLLaunchConfigurationTab extends AbstractLaunchConfigurationTab
-{
-	private ILaunchConfigurationTab[] blocks;
-
-	protected void setBlocks(ILaunchConfigurationTab[] blocks)
-	{
-		this.blocks = blocks;
-	}
-
-	public void createControl(Composite parent)
-	{
-		Composite comp = new Composite(parent, SWT.NONE);
-		comp.setFont(parent.getFont());
-		// TODO PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(),
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		comp.setLayout(layout);
-		setControl(comp);
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-		for (ILaunchConfigurationTab element : blocks)
-			element.setDefaults(configuration);
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		for (ILaunchConfigurationTab element : blocks)
-			element.initializeFrom(configuration);
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		for (ILaunchConfigurationTab element : blocks)
-			element.performApply(configuration);
-	}
-
-	@Override
-	public void setLaunchConfigurationDialog(ILaunchConfigurationDialog dialog)
-	{
-		super.setLaunchConfigurationDialog(dialog);
-		for (ILaunchConfigurationTab element : blocks)
-			element.setLaunchConfigurationDialog(dialog);
-	}
-
-	@Override
-	public void dispose()
-	{
-		for (ILaunchConfigurationTab element : blocks)
-			element.dispose();
-	}
-
-	@Override
-	public void activated(ILaunchConfigurationWorkingCopy workingCopy)
-	{
-		// don't call initializeFrom
-		// super.activated(workingCopy);
-		for (ILaunchConfigurationTab element : blocks)
-			element.activated(workingCopy);
-	}
-
-	@Override
-	public boolean isValid(ILaunchConfiguration configuration)
-	{
-		boolean valid = true;
-		for (ILaunchConfigurationTab element : blocks)
-			valid &= element.isValid(configuration);
-		return valid;
-	}
-
-	@Override
-	public String getErrorMessage()
-	{
-		String m = super.getErrorMessage();
-		if (m == null)
-		{
-			for (ILaunchConfigurationTab element : blocks)
-			{
-				m = element.getErrorMessage();
-				if (m != null)
-					break;
-			}
-		}
-		return m;
-	}
-
-	@Override
-	public String getMessage()
-	{
-		String m = super.getMessage();
-		if (m == null)
-		{
-			for (ILaunchConfigurationTab element : blocks)
-			{
-				m = element.getMessage();
-				if (m != null)
-					break;
-			}
-		}
-		return m;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchShortcut.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchShortcut.java
deleted file mode 100644
index 76f4c7f..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchShortcut.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-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.core.runtime.Status;
-import org.eclipse.core.variables.VariablesPlugin;
-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.IDebugModelPresentation;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.StatusDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.InputFileBlock;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-import org.eclipse.wst.xsl.launching.config.LaunchHelper;
-import org.eclipse.wst.xsl.launching.config.LaunchPipeline;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-/**
- * <table border=1>
- * 	<th>
- * 		<tr>
- * 			<td>XML Files</td>
- *  		<td>XSL Files</td>			
- * 			<td>Action</td>
- * 		</tr>
- *  </th>
- *  <tbody>
- *  	<tr>
- * 			<td>1</td>
- * 			<td>0</td>
- * 			<td>Launch assuming embedded stylesheet instruction</td>
- *  	</tr>
- *  	<tr>
- * 			<td>0</td>
- * 			<td>&gt;=1</td>
- * 			<td>Open dialog - prompt for input file</td>
- *  	</tr>
- *  	<tr>
- * 			<td>1</td>
- * 			<td>&gt;=1</td>
- * 			<td>Launch</td>
- *  	</tr>
- *  </tbody>
- * </table>
- * 
- * <p>The launch shortcut should not appear in the menu for any other combination of files</p>
- * <p>In all cases, a check must be performed to find any existing launch configuration that uses the selected files.</p>
- * 
- * @author Doug
- */
-public class XSLLaunchShortcut implements ILaunchShortcut
-{
-	private IFile xmlFile;
-	private IPath xmlFilePath;
-	private IFile[] xslFiles;
-	
-	public void launch(ISelection selection, String mode)
-	{
-		if (selection instanceof IStructuredSelection)
-		{
-			IStructuredSelection ssel = (IStructuredSelection)selection;
-			searchAndLaunch(ssel.toArray(),mode);
-		}
-	}
-
-	public void launch(IEditorPart editor, String mode)
-	{
-        IEditorInput input = editor.getEditorInput();
-		if (input != null)
-		{
-			IFile file = (IFile) input.getAdapter(IFile.class);
-			if (file != null)
-				searchAndLaunch(new Object[]{ file }, mode);
-		} 
-	}
-	
-	private void searchAndLaunch(Object[] objects, String mode)
-	{
-		if (fillFiles(objects))
-		{
-			// ensure we have an input file
-			if (xmlFile == null)
-				promptForInput();
-			if (xmlFile != null || xmlFilePath != null)
-				launch(mode);
-		}
-	}
-
-	private void promptForInput()
-	{
-		// prompt for input xml file
-		StatusDialog dialog = new StatusDialog(getShell()){
-			private InputFileBlock inputFileBlock = new InputFileBlock(null);
-			
-			@Override
-			protected Control createDialogArea(Composite parent)
-			{
-				Composite comp = (Composite)super.createDialogArea(parent);
-				comp.setFont(parent.getFont());
-				GridLayout layout = new GridLayout(1, false);
-				comp.setLayout(layout);
-				
-				Label label = new Label(comp,SWT.NONE);
-				label.setFont(comp.getFont());
-				GridData gd = new GridData();
-				gd.horizontalIndent = 5;
-				gd.verticalIndent = 5;
-				gd.widthHint = 380;
-				label.setLayoutData(gd);
-				label.setText(Messages.getString("XSLLaunchShortcut.0")); //$NON-NLS-1$
-				
-				inputFileBlock.createControl(comp);
-				return comp;
-			}
-			
-			@Override
-			protected void okPressed()
-			{
-				IResource res = inputFileBlock.getResource();
-				if (res == null)
-					xmlFilePath = new Path(inputFileBlock.getText());
-				else if (ResourcesPlugin.getWorkspace().getRoot().exists(res.getFullPath()) && res.getType() == IResource.FILE)
-					xmlFile = (IFile)res;
-				super.okPressed();
-			}
-			
-		};
-		dialog.setHelpAvailable(false);
-		dialog.setStatusLineAboveButtons(true);
-		dialog.setTitle(Messages.getString("XSLLaunchShortcut.1")); //$NON-NLS-1$
-		dialog.open();
-	}
-
-	private boolean fillFiles(Object[] selections)
-	{
-		xmlFile = null;
-		xmlFilePath = null;
-		List<IFile> xslFileList = new ArrayList<IFile>();
-		for (Object object : selections)
-		{
-			IResource resource = (IResource)object;
-			if (resource.getType() == IResource.FILE)
-			{
-				IFile file = (IFile)resource;
-				if (XSLTRuntime.isXMLFile(file))
-				{
-					if (XSLTRuntime.isXSLFile(file))
-						xslFileList.add(file);
-					else if (xmlFile==null)
-						xmlFile = file;
-					else
-						return false; // no action if we have more than than 1 xml file
-				}
-			}
-		}
-		xslFiles = xslFileList.toArray(new IFile[0]);
-		return true;
-	}
-
-	private void launch(String mode)
-	{
-		if (xmlFile!=null)
-			xmlFilePath = xmlFile.getLocation();
-		ILaunchConfiguration config = null;
-		try
-		{
-			config = findOrCreateLaunchConfiguration();
-			if (config!=null)
-				DebugUITools.launch(config, mode);
-		}
-		catch (CoreException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	private ILaunchManager getLaunchManager()
-	{
-		return DebugPlugin.getDefault().getLaunchManager();
-	}
-
-	private ILaunchConfigurationType getConfigurationType()
-	{
-		return getLaunchManager().getLaunchConfigurationType(XSLLaunchConfigurationConstants.ID_LAUNCH_CONFIG_TYPE);
-	}
-
-	private ILaunchConfiguration findOrCreateLaunchConfiguration() throws CoreException
-	{
-		ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations(getConfigurationType());
-		List<ILaunchConfiguration> candidateConfigs = new ArrayList<ILaunchConfiguration>(configs.length);
-		for (ILaunchConfiguration config : configs)
-		{
-			String inputFile = config.getAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, (String) null);
-			inputFile = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(inputFile);
-			Path path = new Path(inputFile);
-			// the source xml file must be the same
-			if (path.equals(xmlFilePath))
-			{
-				LaunchHelper lh = new LaunchHelper(config);
-				// all the selected stylesheets must be in the pipeline
-				boolean found = false;
-				for (IFile stylesheet : xslFiles)
-				{
-					found = false;
-					for (Iterator<LaunchTransform> iter = lh.getPipeline().getTransformDefs().iterator(); iter.hasNext();)
-					{
-						LaunchTransform lt = iter.next();
-						if (lt.getLocation().equals(stylesheet.getLocation()))
-						{
-							found = true;
-							break;
-						}
-					}
-					if (!found)
-						break;
-				}
-				if (found)
-					candidateConfigs.add(config);
-			}
-		}
-
-		ILaunchConfiguration config = null;
-		int candidateCount = candidateConfigs.size();
-		if (candidateCount == 1)
-			config = (ILaunchConfiguration)candidateConfigs.get(0);
-		else if (candidateCount > 1)
-			config = chooseConfiguration(candidateConfigs);
-		else
-			config = createConfiguration();
-
-		return config;
-	}
-
-	private ILaunchConfiguration chooseConfiguration(List<ILaunchConfiguration> configList)
-	{
-		IDebugModelPresentation labelProvider = DebugUITools.newDebugModelPresentation();
-		ElementListSelectionDialog dialog = new ElementListSelectionDialog(getShell(), labelProvider);
-		dialog.setElements(configList.toArray());
-		dialog.setTitle(Messages.getString("XSLLaunchShortcut.2")); //$NON-NLS-1$
-		dialog.setMessage("&Select existing configuration:"); //$NON-NLS-1$
-		dialog.setMultipleSelection(false);
-		int result = dialog.open();
-		labelProvider.dispose();
-		if (result == Window.OK)
-		{
-			return (ILaunchConfiguration) dialog.getFirstResult();
-		}
-		return null;
-	}
-
-	private ILaunchConfiguration createConfiguration()
-	{
-		ILaunchConfiguration config = null;
-		try
-		{
-			ILaunchConfigurationType configType = getConfigurationType();
-			ILaunchConfigurationWorkingCopy wc = configType.newInstance(null, getLaunchManager().generateUniqueLaunchConfigurationNameFrom(xmlFilePath.lastSegment()));
-			if (xmlFile != null)
-				wc.setAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, "${workspace_loc:" + xmlFile.getFullPath().toPortableString()+"}"); //$NON-NLS-1$ //$NON-NLS-2$
-			else
-				wc.setAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, xmlFilePath.toPortableString());
-			wc.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_FEATURES_FROM_PREFERENCES, true);
-			wc.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_OUTPUT_FILE, true);
-			wc.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, true);
-			wc.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR_WORKING_DIR, true);
-
-			LaunchPipeline pipeline = new LaunchPipeline();
-			for (IFile element : xslFiles)
-			{
-				pipeline.addTransformDef(new LaunchTransform(element.getFullPath().toPortableString(), LaunchTransform.RESOURCE_TYPE));
-			}
-			wc.setAttribute(XSLLaunchConfigurationConstants.ATTR_PIPELINE, pipeline.toXML());
-			if (xmlFile!=null)
-				wc.setMappedResources(new IResource[]{ xmlFile.getProject() });
-			config = wc.doSave();
-		}
-		catch (CoreException exception)
-		{
-			MessageDialog.openError(getShell(), Messages.getString("XSLLaunchShortcut.6"), exception.getStatus().getMessage()); //$NON-NLS-1$
-		}
-		return config;
-	}
-
-	protected Shell getShell()
-	{
-		return XSLDebugUIPlugin.getActiveWorkbenchShell();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLTTabGroup.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLTTabGroup.java
deleted file mode 100644
index 339ec51..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLTTabGroup.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.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.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.XSLMainTab;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.output.OutputTab;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.XSLProcessorTab;
-
-public class XSLTTabGroup extends AbstractLaunchConfigurationTabGroup
-{
-	public XSLTTabGroup()
-	{
-	}
-
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode)
-	{
-		XSLMainTab main = new XSLMainTab();
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[]
-		{ main, new XSLProcessorTab(), new OutputTab(main),
-		// new FOFormatterTab(),
-				// new XSLFeaturesTab(),
-				new JavaJRETab(), new JavaClasspathTab(), new SourceLookupTab(), new CommonTab() };
-		setTabs(tabs);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractParameterAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractParameterAction.java
deleted file mode 100644
index f1136d8..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractParameterAction.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.actions.SelectionListenerAction;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.ParameterViewer;
-
-public abstract class AbstractParameterAction extends SelectionListenerAction
-{
-	public static final int DEFAULT = 0;
-	public static final int ADD = 1;
-	public static final int REMOVE = 2;
-	public static final int MOVE = 3;
-
-	private ParameterViewer viewer;
-	private Button button;
-	private Shell shell;
-
-	protected AbstractParameterAction(String text, ParameterViewer viewer)
-	{
-		super(text);
-		setViewer(viewer);
-	}
-
-	public void setViewer(ParameterViewer viewer)
-	{
-		if (this.viewer != null)
-		{
-			this.viewer.removeSelectionChangedListener(this);
-		}
-		this.viewer = viewer;
-		if (viewer != null)
-		{
-			viewer.addSelectionChangedListener(this);
-			update();
-		}
-	}
-
-	protected ParameterViewer getViewer()
-	{
-		return viewer;
-	}
-
-	public void setButton(Button button)
-	{
-		this.button = button;
-		button.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent evt)
-			{
-				run();
-			}
-		});
-		button.setEnabled(isEnabled());
-	}
-
-	@Override
-	public void setEnabled(boolean enabled)
-	{
-		super.setEnabled(enabled);
-		if (button != null)
-		{
-			button.setEnabled(enabled);
-		}
-	}
-
-	protected void update()
-	{
-		selectionChanged((IStructuredSelection) getViewer().getSelection());
-	}
-
-	protected Shell getShell()
-	{
-		if (shell == null)
-		{
-			shell = getViewer().getShell();
-		}
-		return shell;
-	}
-
-	public void setShell(Shell shell)
-	{
-		this.shell = shell;
-	}
-
-	@Override
-	protected boolean updateSelection(IStructuredSelection selection)
-	{
-		return getViewer().updateSelection(getActionType(), selection);
-	}
-
-	protected int getActionType()
-	{
-		return DEFAULT;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractStylesheetAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractStylesheetAction.java
deleted file mode 100644
index 1e4a1e9..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractStylesheetAction.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.actions.SelectionListenerAction;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
-import org.eclipse.wst.xsl.launching.config.LaunchPipeline;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public abstract class AbstractStylesheetAction extends SelectionListenerAction
-{
-	public static final int DEFAULT = 0;
-	public static final int ADD = 1;
-	public static final int REMOVE = 2;
-	public static final int MOVE = 3;
-
-	private StylesheetViewer viewer;
-	private Button button;
-	private Shell shell;
-
-	protected AbstractStylesheetAction(String text, StylesheetViewer viewer)
-	{
-		super(text);
-		setViewer(viewer);
-	}
-
-	public void addTransforms(LaunchTransform[] res)
-	{
-		viewer.addTransforms(res);
-	}
-
-	public void setViewer(StylesheetViewer viewer)
-	{
-		if (this.viewer != null)
-		{
-			this.viewer.removeSelectionChangedListener(this);
-		}
-		this.viewer = viewer;
-		if (viewer != null)
-		{
-			viewer.addSelectionChangedListener(this);
-			update();
-		}
-	}
-
-	protected StylesheetViewer getViewer()
-	{
-		return viewer;
-	}
-
-	public void setButton(Button button)
-	{
-		this.button = button;
-		button.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent evt)
-			{
-				run();
-			}
-		});
-		button.setEnabled(isEnabled());
-	}
-
-	@Override
-	public void setEnabled(boolean enabled)
-	{
-		super.setEnabled(enabled);
-		if (button != null)
-		{
-			button.setEnabled(enabled);
-		}
-	}
-
-	protected void update()
-	{
-		selectionChanged((IStructuredSelection) getViewer().getSelection());
-	}
-
-	protected Shell getShell()
-	{
-		if (shell == null)
-		{
-			shell = getViewer().getShell();
-		}
-		return shell;
-	}
-
-	public void setShell(Shell shell)
-	{
-		this.shell = shell;
-	}
-
-	@Override
-	protected boolean updateSelection(IStructuredSelection selection)
-	{
-		return getViewer().updateSelection(getActionType(), selection);
-	}
-
-	protected int getActionType()
-	{
-		return DEFAULT;
-	}
-
-	protected List<?> getOrderedSelection()
-	{
-		List<?> selection = ((IStructuredSelection) getViewer().getSelection()).toList();
-		return selection;
-	}
-
-	protected List<LaunchTransform> getEntriesAsList()
-	{
-		// IStylesheetEntry[] entries = getViewer().getEntries();
-		// List list = new ArrayList(entries.length);
-		// for (int i = 0; i < entries.length; i++) {
-		// list.add(entries[i]);
-		// }
-		LaunchPipeline lp = (LaunchPipeline) getViewer().getInput();
-		return lp.getTransformDefs();
-	}
-
-	protected void setEntries(List<?> list)
-	{
-		getViewer().setEntries((LaunchTransform[]) list.toArray(new LaunchTransform[list.size()]));
-		// // update all selection listeners
-		// getViewer().setSelection(getViewer().getSelection());
-	}
-
-	protected boolean isIndexSelected(IStructuredSelection selection, int index)
-	{
-		if (selection.isEmpty())
-		{
-			return false;
-		}
-		Iterator<?> entries = selection.iterator();
-		List<?> list = getEntriesAsList();
-		while (entries.hasNext())
-		{
-			Object next = entries.next();
-			if (list.indexOf(next) == index)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.java
deleted file mode 100644
index 6a2ea22..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ActionMessages extends NLS
-{
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.actions.ActionMessages"; //$NON-NLS-1$
-
-	public static String RemoveAction_Text;
-
-	public static String AddWorkspaceFileAction_Text;
-
-	public static String AddExternalFileAction_Text;
-
-	public static String MoveDownAction_Text;
-
-	public static String MoveUpAction_Text;
-
-	public static String AddExternalFileAction_Selection_3;
-
-	public static String AddWorkspaceFileAction_DialogMessage;
-
-	public static String AddWorkspaceFileAction_DialogTitle;
-
-	public static String EditStylesheetParametersAction_Text;
-
-	public static String AddParameterAction;
-
-	public static String RemoveParameterAction;
-
-	public static String VariablesFieldButton_Text;
-
-	public static String AddParameterAction_Dialog;
-
-	public static String AddParameterAction_Dialog_Label;
-
-	public static String AddParameterAction_Dialog_Name;
-
-	public static String AddParameterAction_Dialog_Type;
-
-	public static String AddParameterAction_Dialog_Value;
-
-	static
-	{
-		NLS.initializeMessages(BUNDLE_NAME, ActionMessages.class);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.properties
deleted file mode 100644
index e11aaa5..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ActionMessages.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-RemoveAction_Text=Remove
-AddWorkspaceFileAction_Text=Add Files
-AddExternalFileAction_Text=Add External Files
-MoveDownAction_Text=Move Down
-MoveUpAction_Text=Move Up
-AddExternalFileAction_Selection_3=
-AddWorkspaceFileAction_DialogMessage=Choose Stylesheet
-AddWorkspaceFileAction_DialogTitle=
-EditStylesheetParametersAction_Text=Edit Parameters
-AddParameterAction=Add Parameter
-RemoveParameterAction=Remove Parameter
-VariablesFieldButton_Text=Variables...
-AddParameterAction_Dialog=Add XSLT Parameter
-AddParameterAction_Dialog_Label=AddParameterAction_Dialog_Label
-AddParameterAction_Dialog_Name=Name:
-AddParameterAction_Dialog_Type=Type:
-AddParameterAction_Dialog_Value=Value:
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddExternalFileAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddExternalFileAction.java
deleted file mode 100644
index 0c99add..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddExternalFileAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class AddExternalFileAction extends OpenDialogAction
-{
-
-	public AddExternalFileAction(StylesheetViewer viewer, String dialogSettingsPrefix)
-	{
-		super(ActionMessages.AddExternalFileAction_Text, viewer, dialogSettingsPrefix);
-	}
-
-	@Override
-	public void run()
-	{
-		String lastUsedPath = getDialogSetting(LAST_PATH_SETTING);
-		if (lastUsedPath == null)
-		{
-			lastUsedPath = ""; //$NON-NLS-1$
-		}
-		FileDialog dialog = new FileDialog(getShell(), SWT.MULTI);
-		dialog.setText(ActionMessages.AddExternalFileAction_Selection_3);
-		dialog.setFilterPath(lastUsedPath);
-		dialog.setFilterExtensions(new String[]{ "*.xsl" }); //$NON-NLS-1$
-		String res = dialog.open();
-		if (res == null)
-		{
-			return;
-		}
-
-		IPath filterPath = new Path(dialog.getFilterPath());
-		LaunchTransform[] lts = new LaunchTransform[1];
-		IPath path = new Path(res).makeAbsolute();
-		lts[0] = new LaunchTransform(path.toPortableString(), LaunchTransform.EXTERNAL_TYPE);
-
-		setDialogSetting(LAST_PATH_SETTING, filterPath.toOSString());
-
-		addTransforms(lts);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddParameterAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddParameterAction.java
deleted file mode 100644
index 163087d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddParameterAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.ParameterViewer;
-import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
-
-public class AddParameterAction extends AbstractParameterAction
-{
-	final String[] types = new String[]
-	{ LaunchAttribute.TYPE_STRING, LaunchAttribute.TYPE_BOOLEAN, LaunchAttribute.TYPE_INT, LaunchAttribute.TYPE_DOUBLE, LaunchAttribute.TYPE_FLOAT, LaunchAttribute.TYPE_OBJECT,
-			LaunchAttribute.TYPE_CLASS, };
-
-	public AddParameterAction(ParameterViewer viewer)
-	{
-		super(ActionMessages.AddParameterAction, viewer);
-	}
-
-	@Override
-	public void run()
-	{
-		MultipleInputDialog dialog = new MultipleInputDialog(getShell(), ActionMessages.AddParameterAction_Dialog);
-		String namelabel = ActionMessages.AddParameterAction_Dialog_Name;
-		dialog.addTextField(namelabel, null, false);
-		String typelabel = ActionMessages.AddParameterAction_Dialog_Type;
-		dialog.addComboField(typelabel, 0, types);
-		String variableslabel = ActionMessages.AddParameterAction_Dialog_Value;
-		dialog.addVariablesField(variableslabel, null, false);
-		dialog.open();
-
-		if (dialog.getReturnCode() == Window.OK)
-		{
-			String name = dialog.getStringValue(namelabel);
-			int type = dialog.getIntValue(typelabel);
-			String value = dialog.getStringValue(variableslabel);
-			LaunchAttribute parameter = null;
-			if (value != null && value.indexOf("${") > -1) //$NON-NLS-1$
-				parameter = new LaunchAttribute(name, types[type], value);
-			else
-				parameter = new LaunchAttribute(name, types[type], value);
-			getViewer().addParameter(parameter);
-		}
-	}
-
-	@Override
-	public void setEnabled(boolean enabled)
-	{
-		// do nothing
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddWorkspaceFileAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddWorkspaceFileAction.java
deleted file mode 100644
index a393316..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddWorkspaceFileAction.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.views.navigator.ResourceSorter;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class AddWorkspaceFileAction extends AbstractStylesheetAction
-{
-	private final ISelectionStatusValidator validator = new ISelectionStatusValidator()
-	{
-		public IStatus validate(Object[] selection)
-		{
-			if (selection.length == 0)
-			{
-				return new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
-			}
-			for (int i = 0; i < selection.length; i++)
-			{
-				if (!(selection[i] instanceof IFile))
-				{
-					return new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
-				}
-			}
-			return new Status(IStatus.OK, XSLDebugUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
-		}
-	};
-
-	public AddWorkspaceFileAction(StylesheetViewer viewer)
-	{
-		super(ActionMessages.AddWorkspaceFileAction_Text, viewer);
-	}
-
-	@Override
-	public void run()
-	{
-
-		// ViewerFilter filter= new StylesheetFilter(getSelectedJars());
-
-		ILabelProvider lp = new WorkbenchLabelProvider();
-		ITreeContentProvider cp = new WorkbenchContentProvider();
-
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(getShell(), lp, cp);
-		dialog.setValidator(validator);
-		dialog.setTitle(ActionMessages.AddWorkspaceFileAction_DialogTitle);
-		dialog.setMessage(ActionMessages.AddWorkspaceFileAction_DialogMessage);
-		dialog.addFilter(new ViewerFilter()
-		{
-			@Override
-			public boolean select(Viewer viewer, Object parentElement, Object element)
-			{
-				if (element instanceof IContainer)
-					return true;
-				IFile file = (IFile) element;
-				String fileExt = file.getFileExtension();
-				if (fileExt != null && fileExt.equalsIgnoreCase("xsl")) //$NON-NLS-1$
-				{
-					return true;
-				}
-				return false;
-			}
-		});
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-		dialog.setSorter(new ResourceSorter(ResourceSorter.NAME));
-
-		if (dialog.open() == Window.OK)
-		{
-			Object[] elements = dialog.getResult();
-			LaunchTransform[] res = new LaunchTransform[elements.length];
-			for (int i = 0; i < res.length; i++)
-			{
-				IResource elem = (IResource) elements[i];
-				res[i] = new LaunchTransform(elem.getFullPath().toPortableString(), LaunchTransform.RESOURCE_TYPE);
-			}
-			addTransforms(res);
-		}
-	}
-
-	@Override
-	protected int getActionType()
-	{
-		return ADD;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ControlAccessibleListener.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ControlAccessibleListener.java
deleted file mode 100644
index 423ff7f..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ControlAccessibleListener.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.widgets.Control;
-
-public class ControlAccessibleListener extends AccessibleAdapter
-{
-	private final String controlName;
-
-	public ControlAccessibleListener(String name)
-	{
-		controlName = name;
-	}
-
-	@Override
-	public void getName(AccessibleEvent e)
-	{
-		e.result = controlName;
-	}
-
-	public static void addListener(Control comp, String name)
-	{
-		// strip mnemonic
-		String[] strs = name.split("&"); //$NON-NLS-1$
-		StringBuffer stripped = new StringBuffer();
-		for (String element : strs)
-		{
-			stripped.append(element);
-		}
-		comp.getAccessible().addAccessibleListener(new ControlAccessibleListener(stripped.toString()));
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveDownAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveDownAction.java
deleted file mode 100644
index 22938cf..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveDownAction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class MoveDownAction extends AbstractStylesheetAction
-{
-	public MoveDownAction(StylesheetViewer viewer)
-	{
-		super(ActionMessages.MoveDownAction_Text, viewer);
-	}
-
-	@Override
-	public void run()
-	{
-		List<?> targets = getOrderedSelection();
-		if (targets.isEmpty())
-		{
-			return;
-		}
-		List<LaunchTransform> list = getEntriesAsList();
-		int bottom = list.size() - 1;
-		int index = 0;
-		for (int i = targets.size() - 1; i >= 0; i--)
-		{
-			Object target = targets.get(i);
-			index = list.indexOf(target);
-			if (index < bottom)
-			{
-				bottom = index + 1;
-				Object temp = list.get(bottom);
-				list.set(bottom, (LaunchTransform)target);
-				list.set(index, (LaunchTransform)temp);
-			}
-			bottom = index;
-		}
-		setEntries(list);
-	}
-
-	@Override
-	protected boolean updateSelection(IStructuredSelection selection)
-	{
-		if (selection.isEmpty())
-		{
-			return false;
-		}
-		return getViewer().updateSelection(getActionType(), selection) && !isIndexSelected(selection, getEntriesAsList().size() - 1);
-	}
-
-	@Override
-	protected int getActionType()
-	{
-		return MOVE;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveUpAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveUpAction.java
deleted file mode 100644
index 906f529..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveUpAction.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class MoveUpAction extends AbstractStylesheetAction
-{
-	public MoveUpAction(StylesheetViewer viewer)
-	{
-		super(ActionMessages.MoveUpAction_Text, viewer);
-	}
-
-	@Override
-	public void run()
-	{
-		List<?> targets = getOrderedSelection();
-		if (targets.isEmpty())
-		{
-			return;
-		}
-		int top = 0;
-		int index = 0;
-		List<LaunchTransform> list = getEntriesAsList();
-		Iterator<?> entries = targets.iterator();
-		while (entries.hasNext())
-		{
-			Object target = entries.next();
-			index = list.indexOf(target);
-			if (index > top)
-			{
-				top = index - 1;
-				Object temp = list.get(top);
-				list.set(top, (LaunchTransform)target);
-				list.set(index, (LaunchTransform)temp);
-			}
-			top = index;
-		}
-		setEntries(list);
-	}
-
-	@Override
-	protected boolean updateSelection(IStructuredSelection selection)
-	{
-		if (selection.isEmpty())
-		{
-			return false;
-		}
-		return getViewer().updateSelection(getActionType(), selection) && !isIndexSelected(selection, 0);
-	}
-
-	@Override
-	protected int getActionType()
-	{
-		return MOVE;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MultipleInputDialog.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MultipleInputDialog.java
deleted file mode 100644
index f2df4bb..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MultipleInputDialog.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.debug.ui.StringVariableSelectionDialog;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Scrollable;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-
-public class MultipleInputDialog extends Dialog
-{
-	protected static final String FIELD_NAME = "FIELD_NAME"; //$NON-NLS-1$
-	protected static final int TEXT = 100;
-	protected static final int BROWSE = 101;
-	protected static final int VARIABLE = 102;
-	protected static final int COMBO = 103;
-
-	protected Composite panel;
-
-	protected List<FieldSummary> fieldList = new ArrayList<FieldSummary>();
-	protected List<Scrollable> controlList = new ArrayList<Scrollable>();
-	protected List<Validator> validators = new ArrayList<Validator>();
-	protected Map<Object, Comparable> valueMap = new HashMap<Object, Comparable>();
-
-	private final String title;
-
-	public MultipleInputDialog(Shell shell, String title)
-	{
-		super(shell);
-		this.title = title;
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-	}
-
-	@Override
-	protected void configureShell(Shell shell)
-	{
-		super.configureShell(shell);
-		if (title != null)
-		{
-			shell.setText(title);
-		}
-
-	}
-
-	@Override
-	protected Control createButtonBar(Composite parent)
-	{
-		Control bar = super.createButtonBar(parent);
-		validateFields();
-		return bar;
-	}
-
-	@Override
-	protected Control createDialogArea(Composite parent)
-	{
-		Composite container = (Composite) super.createDialogArea(parent);
-		// ((GridData) parent.getLayoutData()).heightHint = 400;
-		// ((GridData) parent.getLayoutData()).widthHint = 400;
-
-		container.setLayout(new GridLayout(2, false));
-
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		// gd.heightHint = 200;
-		container.setLayoutData(gd);
-
-		panel = new Composite(container, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		panel.setLayout(layout);
-		panel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		for (Iterator<FieldSummary> i = fieldList.iterator(); i.hasNext();)
-		{
-			FieldSummary field = (FieldSummary) i.next();
-			switch (field.type)
-			{
-				case TEXT:
-					createTextField(field.name, field.initialValue, field.allowsEmpty);
-					break;
-				// case BROWSE:
-				// createBrowseField(field.name, field.initialValue,
-				// field.allowsEmpty);
-				// break;
-				case VARIABLE:
-					createVariablesField(field.name, field.initialValue, field.allowsEmpty);
-					break;
-				case COMBO:
-					createComboField(field.name, field.initialIndex, field.items);
-					break;
-			}
-		}
-
-		fieldList = null; // allow it to be gc'd
-		Dialog.applyDialogFont(container);
-
-		return container;
-	}
-
-	public void addBrowseField(String labelText, String initialValue, boolean allowsEmpty)
-	{
-		fieldList.add(new FieldSummary(BROWSE, labelText, initialValue, allowsEmpty));
-	}
-
-	public void addTextField(String labelText, String initialValue, boolean allowsEmpty)
-	{
-		fieldList.add(new FieldSummary(TEXT, labelText, initialValue, allowsEmpty));
-	}
-
-	public void addVariablesField(String labelText, String initialValue, boolean allowsEmpty)
-	{
-		fieldList.add(new FieldSummary(VARIABLE, labelText, initialValue, allowsEmpty));
-	}
-
-	public void addComboField(String labelText, int initialIndex, String[] items)
-	{
-		fieldList.add(new FieldSummary(COMBO, labelText, items, initialIndex));
-	}
-
-	protected void createTextField(String labelText, String initialValue, boolean allowEmpty)
-	{
-		Label label = new Label(panel, SWT.NONE);
-		label.setText(labelText);
-		label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-		final Text text = new Text(panel, SWT.SINGLE | SWT.BORDER);
-		text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		text.setData(FIELD_NAME, labelText);
-
-		// make sure rows are the same height on both panels.
-		label.setSize(label.getSize().x, text.getSize().y);
-
-		if (initialValue != null)
-		{
-			text.setText(initialValue);
-		}
-
-		if (!allowEmpty)
-		{
-			validators.add(new Validator()
-			{
-				@Override
-				public boolean validate()
-				{
-					return !text.getText().equals(""); //$NON-NLS-1$
-				}
-			});
-			text.addModifyListener(new ModifyListener()
-			{
-				public void modifyText(ModifyEvent e)
-				{
-					validateFields();
-				}
-			});
-		}
-
-		controlList.add(text);
-	}
-
-	public void createVariablesField(String labelText, String initialValue, boolean allowEmpty)
-	{
-		Label label = new Label(panel, SWT.NONE);
-		label.setText(labelText);
-		label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-		Composite comp = new Composite(panel, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		comp.setLayout(layout);
-		comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		final Text text = new Text(comp, SWT.SINGLE | SWT.BORDER);
-		GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = 200;
-		text.setLayoutData(data);
-		text.setData(FIELD_NAME, labelText);
-
-		// make sure rows are the same height on both panels.
-		label.setSize(label.getSize().x, text.getSize().y);
-
-		if (initialValue != null)
-		{
-			text.setText(initialValue);
-		}
-
-		if (!allowEmpty)
-		{
-			validators.add(new Validator()
-			{
-				@Override
-				public boolean validate()
-				{
-					return !text.getText().equals(""); //$NON-NLS-1$
-				}
-			});
-
-			text.addModifyListener(new ModifyListener()
-			{
-				public void modifyText(ModifyEvent e)
-				{
-					validateFields();
-				}
-			});
-		}
-
-		Button button = createButton(comp, IDialogConstants.IGNORE_ID, ActionMessages.VariablesFieldButton_Text, false);
-		button.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				StringVariableSelectionDialog dialog = new StringVariableSelectionDialog(getShell());
-				int code = dialog.open();
-				if (code == IDialogConstants.OK_ID)
-				{
-					String variable = dialog.getVariableExpression();
-					if (variable != null)
-					{
-						text.insert(variable);
-					}
-				}
-			}
-		});
-
-		controlList.add(text);
-
-	}
-
-	public void createComboField(String labelText, int initialValue, String[] items)
-	{
-		Label label = new Label(panel, SWT.NONE);
-		label.setText(labelText);
-		label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-		Composite comp = new Composite(panel, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		comp.setLayout(layout);
-		comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		final Combo combo = new Combo(comp, SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY);
-		// GridData data = new GridData(GridData.FILL_HORIZONTAL);
-		// data.widthHint = 200;
-		// combo.setLayoutData(data);
-
-		combo.setData(FIELD_NAME, labelText);
-
-		// make sure rows are the same height on both panels.
-		label.setSize(label.getSize().x, combo.getSize().y);
-
-		combo.setItems(items);
-		combo.select(initialValue);
-
-		controlList.add(combo);
-	}
-
-	@Override
-	protected void okPressed()
-	{
-		for (Iterator<Scrollable> i = controlList.iterator(); i.hasNext();)
-		{
-			Control control = (Control) i.next();
-			if (control instanceof Text)
-			{
-				valueMap.put(control.getData(FIELD_NAME), ((Text) control).getText());
-			}
-			else if (control instanceof Combo)
-			{
-				Combo combo = (Combo) control;
-				valueMap.put(control.getData(FIELD_NAME), new Integer(combo.getSelectionIndex()));
-			}
-		}
-		controlList = null;
-		super.okPressed();
-	}
-
-	@Override
-	public int open()
-	{
-		applyDialogFont(panel);
-		return super.open();
-	}
-
-	public Object getValue(String key)
-	{
-		return valueMap.get(key);
-	}
-
-	public String getStringValue(String key)
-	{
-		return (String) getValue(key);
-	}
-
-	public int getIntValue(String key)
-	{
-		return ((Integer) getValue(key)).intValue();
-	}
-
-	public void validateFields()
-	{
-		for (Iterator<Validator> i = validators.iterator(); i.hasNext();)
-		{
-			Validator validator = (Validator) i.next();
-			if (!validator.validate())
-			{
-				getButton(IDialogConstants.OK_ID).setEnabled(false);
-				return;
-			}
-		}
-		getButton(IDialogConstants.OK_ID).setEnabled(true);
-	}
-
-	private String getDialogSettingsSectionName()
-	{
-		return XSLDebugUIPlugin.PLUGIN_ID + ".MULTIPLE_INPUT_DIALOG"; //$NON-NLS-1$
-	}
-
-	@Override
-	protected IDialogSettings getDialogBoundsSettings()
-	{
-		IDialogSettings settings = XSLDebugUIPlugin.getDefault().getDialogSettings();
-		IDialogSettings section = settings.getSection(getDialogSettingsSectionName());
-		if (section == null)
-		{
-			section = settings.addNewSection(getDialogSettingsSectionName());
-		}
-		return section;
-	}
-
-	protected class FieldSummary
-	{
-		int initialIndex;
-		int type;
-		String name;
-		String initialValue;
-		boolean allowsEmpty;
-		String[] items;
-
-		public FieldSummary(int type, String name, String initialValue, boolean allowsEmpty)
-		{
-			this.type = type;
-			this.name = name;
-			this.initialValue = initialValue;
-			this.allowsEmpty = allowsEmpty;
-		}
-
-		public FieldSummary(int type, String name, String[] items, int initialIndex)
-		{
-			this.type = type;
-			this.name = name;
-			this.items = items;
-		}
-	}
-
-	protected class Validator
-	{
-		boolean validate()
-		{
-			return true;
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/OpenDialogAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/OpenDialogAction.java
deleted file mode 100644
index b8de6ee..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/OpenDialogAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
-
-public class OpenDialogAction extends AbstractStylesheetAction
-{
-	protected static final String LAST_PATH_SETTING = "LAST_PATH_SETTING"; //$NON-NLS-1$
-	private String fPrefix = null;
-
-	public OpenDialogAction(String label, StylesheetViewer viewer, String dialogSettingsPrefix)
-	{
-		super(label, viewer);
-		fPrefix = dialogSettingsPrefix;
-	}
-
-	protected String getDialogSettingsPrefix()
-	{
-		return fPrefix;
-	}
-
-	protected String getDialogSetting(String settingName)
-	{
-		return getDialogSettings().get(getDialogSettingsPrefix() + "." + settingName); //$NON-NLS-1$
-	}
-
-	protected void setDialogSetting(String settingName, String value)
-	{
-		getDialogSettings().put(getDialogSettingsPrefix() + "." + settingName, value); //$NON-NLS-1$
-	}
-
-	protected IDialogSettings getDialogSettings()
-	{
-		IDialogSettings settings = XSLDebugUIPlugin.getDefault().getDialogSettings();
-		return settings;
-	}
-
-	@Override
-	protected int getActionType()
-	{
-		return ADD;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java
deleted file mode 100644
index 9e82c8c..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class RemoveAction extends AbstractStylesheetAction
-{
-	public RemoveAction(StylesheetViewer viewer)
-	{
-		super(ActionMessages.RemoveAction_Text, viewer);
-	}
-
-	@Override
-	public void run()
-	{
-		IStructuredSelection selection = (IStructuredSelection) getViewer().getSelection();
-		getViewer().removeEntries((LaunchTransform[]) selection.toList().toArray(new LaunchTransform[0]));
-	}
-
-	@Override
-	protected boolean updateSelection(IStructuredSelection selection)
-	{
-		if (selection.isEmpty())
-		{
-			return false;
-		}
-		return getViewer().updateSelection(getActionType(), selection);
-	}
-
-	@Override
-	protected int getActionType()
-	{
-		return MOVE;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveParameterAction.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveParameterAction.java
deleted file mode 100644
index d091ca2..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveParameterAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.ParameterViewer;
-import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
-
-public class RemoveParameterAction extends AbstractParameterAction
-{
-
-	public RemoveParameterAction(ParameterViewer viewer)
-	{
-		super(ActionMessages.RemoveParameterAction, viewer);
-	}
-
-	@Override
-	public void run()
-	{
-		IStructuredSelection sel = getStructuredSelection();
-		if (sel.size() > 0)
-		{
-			LaunchAttribute[] entries = new LaunchAttribute[sel.size()];
-			int i = 0;
-			for (Iterator<?> iter = sel.iterator(); iter.hasNext(); i++)
-			{
-				LaunchAttribute att = (LaunchAttribute) iter.next();
-				entries[i] = att;
-			}
-			getViewer().removeEntries(entries);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/Messages.java
deleted file mode 100644
index 49c7404..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/Messages.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.wst.xsl.internal.debug.ui.breakpoint;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.breakpoint.messages"; //$NON-NLS-1$
-	public static String XSLBreakpointProvider_0;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/XSLBreakpointProvider.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/XSLBreakpointProvider.java
deleted file mode 100644
index 8bab02b..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/XSLBreakpointProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.breakpoint;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModel;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.IBreakpointProvider;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.launching.model.XSLLineBreakpoint;
-
-public class XSLBreakpointProvider implements IBreakpointProvider, IExecutableExtension
-{
-	public IStatus addBreakpoint(IDocument document, IEditorInput input, int editorLineNumber, int offset) throws CoreException
-	{
-		// check if there is a valid position to set breakpoint
-		int pos = getValidPosition(document, editorLineNumber);
-		IStatus status = null;
-		if (pos >= 0)
-		{
-			IResource res = getResourceFromInput(input);
-			if (res != null)
-			{
-				boolean add = true;
-				if (add)
-				{
-					IBreakpoint point = new XSLLineBreakpoint(res, editorLineNumber, pos, pos);
-					if (point == null)
-					{
-						status = new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, IStatus.ERROR, Messages.XSLBreakpointProvider_0, null);
-					}
-					else
-					{
-						// DebugPlugin.getDefault().getBreakpointManager().addBreakpoint(point);
-					}
-				}
-			}
-			else if (input instanceof IStorageEditorInput)
-			{
-				res = ResourcesPlugin.getWorkspace().getRoot();
-				String id = input.getName();
-				if (input instanceof IStorageEditorInput && ((IStorageEditorInput) input).getStorage() != null && ((IStorageEditorInput) input).getStorage().getFullPath() != null)
-				{
-					id = ((IStorageEditorInput) input).getStorage().getFullPath().toString();
-				}
-				Map<String, String> attributes = new HashMap<String, String>();
-				attributes.put(StructuredResourceMarkerAnnotationModel.SECONDARY_ID_KEY, id);
-				IBreakpoint point = new XSLLineBreakpoint(res, editorLineNumber, pos, pos);
-				if (point == null)
-				{
-					status = new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, IStatus.ERROR, Messages.XSLBreakpointProvider_0, null);
-				}
-			}
-		}
-		if (status == null)
-		{
-			status = new Status(IStatus.OK, XSLDebugUIPlugin.PLUGIN_ID, IStatus.OK, "JSPUIMessages.OK", null); //$NON-NLS-1$
-		}
-		return status;
-	}
-
-	public IResource getResource(IEditorInput input)
-	{
-		return getResourceFromInput(input);
-	}
-
-	private IResource getResourceFromInput(IEditorInput input)
-	{
-		IResource resource = (IResource) input.getAdapter(IFile.class);
-		if (resource == null)
-		{
-			resource = (IResource) input.getAdapter(IResource.class);
-		}
-		return resource;
-	}
-
-	private int getValidPosition(IDocument idoc, int editorLineNumber)
-	{
-		int result = -1;
-		if (idoc != null)
-		{
-			int startOffset = 0;
-			int endOffset = 0;
-			try
-			{
-				IRegion line = idoc.getLineInformation(editorLineNumber - 1);
-				startOffset = line.getOffset();
-				endOffset = Math.max(line.getOffset(), line.getOffset() + line.getLength());
-
-				String lineText = idoc.get(startOffset, endOffset - startOffset).trim();
-
-				// blank lines or PI's cannot have breakpoints
-				if (lineText.trim().equals("") || lineText.startsWith("<?")) //$NON-NLS-1$ //$NON-NLS-2$
-				{
-					result = -1;
-				}
-				else
-				{
-					// get all partitions for current line
-					ITypedRegion[] partitions = null;
-
-					partitions = idoc.computePartitioning(startOffset, endOffset - startOffset);
-
-					for (int i = 0; i < partitions.length; ++i)
-					{
-						String type = partitions[i].getType();
-						result = partitions[i].getOffset();
-					}
-				}
-			}
-			catch (BadLocationException e)
-			{
-				result = -1;
-			}
-		}
-		return result;
-	}
-
-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException
-	{
-		// not used
-	}
-
-	public void setSourceEditingTextTools(ISourceEditingTextTools tools)
-	{
-		// not used
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/messages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/messages.properties
deleted file mode 100644
index 30115d4..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-XSLBreakpointProvider_0=unsupported input type
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/messages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/messages.properties
deleted file mode 100644
index d51967d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/messages.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-ResourceSelectionBlock.0=File:
-XSLLaunchShortcut.0=Select an input file for the transformation
-XSLLaunchShortcut.1=Input File
-XSLLaunchShortcut.2=Select a Launch Configuration
-XSLLaunchShortcut.6=Error
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLBreakpointAdapterFactory.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLBreakpointAdapterFactory.java
deleted file mode 100644
index ceb09a3..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLBreakpointAdapterFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.model;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
-import org.eclipse.ui.texteditor.ITextEditor;
-
-/**
- * Creates a toggle breakpoint adapter
- */
-public class XSLBreakpointAdapterFactory implements IAdapterFactory
-{
-	@SuppressWarnings("unchecked") //$NON-NLS-1$
-	public Object getAdapter(Object adaptableObject, Class adapterType)
-	{
-		if (adaptableObject instanceof ITextEditor)
-		{
-			ITextEditor editorPart = (ITextEditor) adaptableObject;
-			IResource resource = (IResource) editorPart.getEditorInput().getAdapter(IResource.class);
-			if (resource != null)
-			{
-				String extension = resource.getFileExtension();
-				if (extension != null && extension.equalsIgnoreCase("xsl")) //$NON-NLS-1$
-				{
-					return new XSLLineBreakpointAdapter();
-				}
-			}
-		}
-		return null;
-	}
-
-	@SuppressWarnings("unchecked") //$NON-NLS-1$
-	public Class[] getAdapterList()
-	{
-		return new Class[]
-		{ IToggleBreakpointsTarget.class };
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLLineBreakpointAdapter.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLLineBreakpointAdapter.java
deleted file mode 100644
index 90b3340..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLLineBreakpointAdapter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.model;
-
-import org.eclipse.core.resources.IResource;
-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.debug.ui.actions.IToggleBreakpointsTarget;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.xsl.launching.model.IXSLConstants;
-import org.eclipse.wst.xsl.launching.model.XSLLineBreakpoint;
-
-public class XSLLineBreakpointAdapter implements IToggleBreakpointsTarget
-{
-	public void toggleLineBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException
-	{
-		ITextEditor textEditor = getEditor(part);
-		if (textEditor != null)
-		{
-			IResource resource = (IResource) textEditor.getEditorInput().getAdapter(IResource.class);
-			ITextSelection textSelection = (ITextSelection) selection;
-			int lineNumber = textSelection.getStartLine();
-			IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(IXSLConstants.ID_XSL_DEBUG_MODEL);
-			for (IBreakpoint breakpoint : breakpoints)
-			{
-				if (resource.equals(breakpoint.getMarker().getResource()))
-				{
-					if (((ILineBreakpoint) breakpoint).getLineNumber() == (lineNumber + 1))
-					{
-						// remove
-						breakpoint.delete();
-						return;
-					}
-				}
-			}
-			// create line breakpoint (doc line numbers start at 0)
-			XSLLineBreakpoint lineBreakpoint = new XSLLineBreakpoint(resource, lineNumber + 1, 1, 1);
-			DebugPlugin.getDefault().getBreakpointManager().addBreakpoint(lineBreakpoint);
-		}
-	}
-
-	public boolean canToggleLineBreakpoints(IWorkbenchPart part, ISelection selection)
-	{
-		return getEditor(part) != null;
-	}
-
-	/**
-	 * Returns the editor being used to edit a XSL file, associated with the
-	 * given part, or <code>null</code> if none.
-	 */
-	private ITextEditor getEditor(IWorkbenchPart part)
-	{
-		if (part instanceof ITextEditor)
-		{
-			ITextEditor editorPart = (ITextEditor) part;
-			IResource resource = (IResource) editorPart.getEditorInput().getAdapter(IResource.class);
-			if (resource != null)
-			{
-				String extension = resource.getFileExtension();
-				// TODO handle other file extensions/content types
-				if (extension != null && extension.equalsIgnoreCase("xsl")) //$NON-NLS-1$
-				{
-					return editorPart;
-				}
-			}
-		}
-		return null;
-	}
-
-	public void toggleMethodBreakpoints(IWorkbenchPart part, ISelection selection) throws CoreException
-	{
-	}
-
-	public boolean canToggleMethodBreakpoints(IWorkbenchPart part, ISelection selection)
-	{
-		return false;
-	}
-
-	public void toggleWatchpoints(IWorkbenchPart part, ISelection selection) throws CoreException
-	{
-	}
-
-	public boolean canToggleWatchpoints(IWorkbenchPart part, ISelection selection)
-	{
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLModelPresentation.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLModelPresentation.java
deleted file mode 100644
index 01a1631..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLModelPresentation.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.model;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.debug.ui.IValueDetailListener;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIConstants;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.launching.model.XSLVariable;
-
-public class XSLModelPresentation extends LabelProvider implements IDebugModelPresentation
-{
-	private Image localImg;
-
-	public void setAttribute(String attribute, Object value)
-	{
-	}
-
-	@Override
-	public Image getImage(Object element)
-	{
-		if (element instanceof XSLVariable)
-		{
-			XSLVariable var = (XSLVariable) element;
-			if (var.getScope().equals(XSLVariable.LOCAL_SCOPE))
-			{
-				if (localImg == null)
-					localImg = XSLDebugUIPlugin.getImageDescriptor("/icons/localvariable_obj.gif").createImage(); //$NON-NLS-1$
-				return localImg;
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public String getText(Object element)
-	{
-		return null;
-	}
-
-	@Override
-	public void dispose()
-	{
-		if (localImg != null)
-			localImg.dispose();
-		super.dispose();
-	}
-
-	public void computeDetail(IValue value, IValueDetailListener listener)
-	{
-		String detail = ""; //$NON-NLS-1$
-		try
-		{
-			detail = value.getValueString();
-		}
-		catch (DebugException e)
-		{
-		}
-		listener.detailComputed(value, detail);
-	}
-
-	public IEditorInput getEditorInput(Object element)
-	{
-		if (element instanceof IFile)
-		{
-			return new FileEditorInput((IFile) element);
-		}
-		if (element instanceof ILineBreakpoint)
-		{
-			return new FileEditorInput((IFile) ((ILineBreakpoint) element).getMarker().getResource());
-		}
-		return null;
-	}
-
-	public String getEditorId(IEditorInput input, Object element)
-	{
-		if (element instanceof IFile || element instanceof ILineBreakpoint)
-		{
-			return XSLDebugUIConstants.XSL_EDITOR_ID;
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/AddProcessorDialog.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/AddProcessorDialog.java
deleted file mode 100644
index 2405723..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/AddProcessorDialog.java
+++ /dev/null
@@ -1,445 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.preferences;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.StatusDialog;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.InstallStandin;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.ProcessorMessages;
-import org.eclipse.wst.xsl.launching.IDebugger;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.IProcessorJar;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class AddProcessorDialog extends StatusDialog
-{
-	private final InstallStandin standinProcessor;
-	private final IProcessorType[] processorTypes;
-	private IProcessorType selectedProcessorType;
-	private ComboViewer processorTypeField;
-	private ProcessorLibraryBlock fLibraryBlock;
-	private Text processorNameField;
-	private final IStatus[] fStati;
-	private int fPrevIndex = -1;
-	private final InstalledProcessorsBlock block;
-	private boolean adding;
-	private Button supportsVerson10Checkbox;
-	private Button supportsVerson20Checkbox;
-
-	public AddProcessorDialog(InstalledProcessorsBlock block, Shell parent, IProcessorType[] types, IProcessorInstall install)
-	{
-		super(parent);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.block = block;
-		fStati = new IStatus[5];
-		for (int i = 0; i < fStati.length; i++)
-		{
-			fStati[i] = Status.OK_STATUS;
-		}
-		processorTypes = types;
-		selectedProcessorType = install != null ? install.getProcessorType() : types[0];
-		InstallStandin standin = null;
-		if (install == null)
-		{
-			adding = true;
-			standin = new InstallStandin(XSLTRuntime.createUniqueProcessorId(selectedProcessorType), "", selectedProcessorType.getId(), null, new IProcessorJar[0]); //$NON-NLS-1$
-		}
-		else
-		{
-			standin = new InstallStandin(install);
-		}
-		standinProcessor = standin;
-	}
-
-	@Override
-	protected void configureShell(Shell newShell)
-	{
-		super.configureShell(newShell);
-		// TODO PlatformUI.getWorkbench().getHelpSystem().setHelp...
-	}
-
-	protected void createDialogFields(Composite parent)
-	{
-		GridData gd;
-		Label label;
-
-		label = new Label(parent, SWT.NONE);
-		label.setText(ProcessorMessages.AddProcessorDialog_processorName);
-		processorNameField = new Text(parent, SWT.BORDER);
-		gd = new GridData(SWT.NONE, SWT.NONE, false, false);
-		gd.widthHint = convertWidthInCharsToPixels(50);
-		gd.horizontalSpan = 2;
-		processorNameField.setLayoutData(gd);
-
-		label = new Label(parent, SWT.NONE);
-		label.setText(ProcessorMessages.AddProcessorDialog_processorType);
-		processorTypeField = new ComboViewer(parent, SWT.READ_ONLY);
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		processorTypeField.getCombo().setLayoutData(gd);
-		processorTypeField.setContentProvider(new IStructuredContentProvider()
-		{
-
-			private Object input;
-
-			public Object[] getElements(Object inputElement)
-			{
-				return (IProcessorType[]) input;
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-				input = newInput;
-			}
-		});
-		processorTypeField.setLabelProvider(new LabelProvider()
-		{
-			@Override
-			public String getText(Object element)
-			{
-				return ((IProcessorType) element).getLabel();
-			}
-		});
-
-		label = new Label(parent, SWT.NONE);
-		label.setText(ProcessorMessages.AddProcessorDialog_1);
-		supportsVerson10Checkbox = new Button(parent, SWT.CHECK);
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		supportsVerson10Checkbox.setLayoutData(gd);
-		supportsVerson10Checkbox.setText("XSLT 1.0"); //$NON-NLS-1$
-
-		label = new Label(parent, SWT.NONE);
-		supportsVerson20Checkbox = new Button(parent, SWT.CHECK);
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		supportsVerson20Checkbox.setLayoutData(gd);
-		supportsVerson20Checkbox.setText("XSLT 2.0"); //$NON-NLS-1$
-	}
-
-	protected void createFieldListeners()
-	{
-		processorTypeField.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				updateProcessorType();
-			}
-		});
-
-		processorNameField.addModifyListener(new ModifyListener()
-		{
-			public void modifyText(ModifyEvent e)
-			{
-				setProcessorNameStatus(validateProcessorName());
-				updateStatusLine();
-			}
-		});
-
-		supportsVerson10Checkbox.addSelectionListener(new SelectionListener()
-		{
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-
-			public void widgetSelected(SelectionEvent e)
-			{
-				setVersionStatus(validateVersionStatus());
-				updateStatusLine();
-			}
-		});
-
-		supportsVerson20Checkbox.addSelectionListener(new SelectionListener()
-		{
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-
-			public void widgetSelected(SelectionEvent e)
-			{
-				setVersionStatus(validateVersionStatus());
-				updateStatusLine();
-			}
-		});
-
-	}
-
-	protected String getProcessorName()
-	{
-		return processorNameField.getText();
-	}
-
-	@Override
-	protected Control createDialogArea(Composite ancestor)
-	{
-		Composite parent = (Composite) super.createDialogArea(ancestor);
-		((GridLayout) parent.getLayout()).numColumns = 3;
-//		((GridData) parent.getLayoutData()).heightHint = 400;
-//		((GridData) parent.getLayoutData()).widthHint = 400;
-
-		createDialogFields(parent);
-
-		Label l = new Label(parent, SWT.NONE);
-		l.setText(ProcessorMessages.AddProcessorDialog_jars);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		l.setLayoutData(gd);
-
-		fLibraryBlock = new ProcessorLibraryBlock(this);
-		Control block = fLibraryBlock.createControl(parent);
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.horizontalSpan = 3;
-		block.setLayoutData(gd);
-
-		initializeFields();
-		createFieldListeners();
-		applyDialogFont(parent);
-		
-		return parent;
-	}
-
-	private void updateProcessorType()
-	{
-		int selIndex = processorTypeField.getCombo().getSelectionIndex();
-		if (selIndex == fPrevIndex)
-		{
-			return;
-		}
-		fPrevIndex = selIndex;
-		if (selIndex >= 0 && selIndex < processorTypes.length)
-		{
-			selectedProcessorType = processorTypes[selIndex];
-		}
-		fLibraryBlock.initializeFrom(standinProcessor, selectedProcessorType);
-		updateStatusLine();
-	}
-
-	@Override
-	public void create()
-	{
-		super.create();
-		processorNameField.setFocus();
-	}
-
-	private void initializeFields()
-	{
-		processorTypeField.setInput(processorTypes);
-		if (adding)
-		{
-			processorNameField.setText(""); //$NON-NLS-1$
-			processorTypeField.setSelection(new StructuredSelection(processorTypes[0]));
-			supportsVerson10Checkbox.setSelection(true);
-			fLibraryBlock.initializeFrom(standinProcessor, selectedProcessorType);
-		}
-		else
-		{
-			processorTypeField.getCombo().setEnabled(false);
-			processorTypeField.setSelection(new StructuredSelection(standinProcessor.getProcessorType()));
-			processorNameField.setText(standinProcessor.getName());
-
-			supportsVerson10Checkbox.setSelection(standinProcessor.supports("1.0")); //$NON-NLS-1$
-			supportsVerson20Checkbox.setSelection(standinProcessor.supports("2.0")); //$NON-NLS-1$
-			fLibraryBlock.initializeFrom(standinProcessor, selectedProcessorType);
-		}
-		setProcessorNameStatus(validateProcessorName());
-		updateStatusLine();
-	}
-
-	private IStatus validateProcessorName()
-	{
-		IStatus status = Status.OK_STATUS;
-		String name = processorNameField.getText();
-		if (name == null || name.trim().length() == 0)
-		{
-			status = new Status(IStatus.INFO, XSLDebugUIPlugin.PLUGIN_ID, IStatus.OK, ProcessorMessages.AddProcessorDialog_enterName, null);
-		}
-		else
-		{
-			if (block.isDuplicateName(name) && (standinProcessor == null || !name.equals(standinProcessor.getName())))
-			{
-				status = new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, IStatus.OK, ProcessorMessages.AddProcessorDialog_duplicateName, null);
-			}
-			else
-			{
-				// IStatus s = ResourcesPlugin.getWorkspace().validateName(name,
-				// IResource.FILE);
-				// if (!s.isOK())
-				// {
-				// status.setError(MessageFormat.format(ProcessorMessages.AddProcessorDialog_Processor_name_must_be_a_valid_file_name,
-				// new String[]
-				// { s.getMessage() }));
-				// }
-			}
-		}
-		return status;
-	}
-
-	protected IStatus validateVersionStatus()
-	{
-		IStatus status = Status.OK_STATUS;
-		if (!supportsVerson10Checkbox.getSelection() && !supportsVerson20Checkbox.getSelection())
-			status = new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, IStatus.OK, ProcessorMessages.AddProcessorDialog_7, null);
-		return status;
-	}
-
-	protected void updateStatusLine()
-	{
-		IStatus max = null;
-		for (IStatus curr : fStati)
-		{
-			if (curr.matches(IStatus.ERROR))
-			{
-				updateStatus(curr);
-				return;
-			}
-			if (max == null || curr.getSeverity() > max.getSeverity())
-			{
-				max = curr;
-			}
-		}
-		updateStatus(max);
-	}
-
-	@Override
-	protected void okPressed()
-	{
-		doOkPressed();
-		super.okPressed();
-	}
-
-	private void doOkPressed()
-	{
-		if (adding)
-		{
-			setFieldValuesToProcessor(standinProcessor);
-			block.processorAdded(standinProcessor);
-		}
-//		else
-//			setFieldValuesToProcessor((ProcessorInstall)editedProcessor);
-	}
-
-	protected void setFieldValuesToProcessor(InstallStandin processor)
-	{
-		processor.setName(processorNameField.getText());
-		processor.setProcessorTypeId(selectedProcessorType.getId());
-
-		IDebugger[] debuggers = XSLTRuntime.getDebuggers();
-		for (IDebugger element : debuggers)
-		{
-			if (element.getProcessorType().equals(selectedProcessorType))
-				processor.setDebuggerId(element.getId());
-		}
-
-		String supports = ""; //$NON-NLS-1$
-		if (supportsVerson10Checkbox.getSelection())
-		{
-			supports += "1.0"; //$NON-NLS-1$
-			if (supportsVerson20Checkbox.getSelection())
-				supports += ","; //$NON-NLS-1$
-		}
-		if (supportsVerson20Checkbox.getSelection())
-			supports += "2.0"; //$NON-NLS-1$
-		processor.setSupports(supports);
-		fLibraryBlock.performApply(processor);
-	}
-
-	protected File getAbsoluteFileOrEmpty(String path)
-	{
-		if (path == null || path.length() == 0)
-		{
-			return new File(""); //$NON-NLS-1$
-		}
-		return new File(path).getAbsoluteFile();
-	}
-
-	private void setProcessorNameStatus(IStatus status)
-	{
-		fStati[0] = status;
-	}
-
-	protected IStatus getSystemLibraryStatus()
-	{
-		return fStati[3];
-	}
-
-	protected void setSystemLibraryStatus(IStatus status)
-	{
-		fStati[3] = status;
-	}
-
-	protected void setVersionStatus(IStatus status)
-	{
-		fStati[2] = status;
-	}
-
-	@Override
-	protected void updateButtonsEnableState(IStatus status)
-	{
-		Button ok = getButton(IDialogConstants.OK_ID);
-		if (ok != null && !ok.isDisposed())
-			ok.setEnabled(status.getSeverity() == IStatus.OK);
-	}
-
-	@Override
-	protected void setButtonLayoutData(Button button)
-	{
-		super.setButtonLayoutData(button);
-	}
-
-	protected String getDialogSettingsSectionName()
-	{
-		return "ADD_PROCESSOR_DIALOG_SECTION"; //$NON-NLS-1$
-	}
-
-	@Override
-	protected IDialogSettings getDialogBoundsSettings()
-	{
-//		IDialogSettings settings = XSLDebugUIPlugin.getDefault().getDialogSettings();
-//		IDialogSettings section = settings.getSection(getDialogSettingsSectionName());
-//		if (section == null)
-//		{
-//			section = settings.addNewSection(getDialogSettingsSectionName());
-//		}
-//		return section;
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/BasePreferencePage.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/BasePreferencePage.java
deleted file mode 100644
index 437e294..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/BasePreferencePage.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.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;
-
-public class BasePreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-	@Override
-	protected Control createContents(Composite parent)
-	{
-		return null;
-	}
-
-	public void init(IWorkbench workbench)
-	{
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/FeaturesBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/FeaturesBlock.java
deleted file mode 100644
index 0c1dcdb..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/FeaturesBlock.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.preferences;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.DialogPage;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xsl.internal.debug.ui.AbstractTableBlock;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIConstants;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.launching.IFeature;
-
-public class FeaturesBlock extends AbstractTableBlock
-{
-	private Table table;
-	private TableViewer tViewer;
-	private Map<String, String> featureValues;
-	private Text descriptionText;
-	private DialogPage dialogPage;
-
-	public FeaturesBlock(DialogPage dialogPage)
-	{
-		this.dialogPage = dialogPage;
-	}
-
-	@Override
-	protected IDialogSettings getDialogSettings()
-	{
-		return XSLDebugUIPlugin.getDefault().getDialogSettings();
-	}
-
-	@Override
-	protected String getQualifier()
-	{
-		return XSLDebugUIConstants.FEATURES_BLOCK;
-	}
-
-	@Override
-	protected Table getTable()
-	{
-		return table;
-	}
-
-	public void createControl(Composite parent)
-	{
-		table = new Table(parent, SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL);
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.horizontalSpan = 2;
-		gd.widthHint = 450;
-		table.setLayoutData(gd);
-		table.setLinesVisible(true);
-		table.setHeaderVisible(true);
-
-		TableColumn c1 = new TableColumn(table, SWT.NONE);
-		c1.setWidth(150);
-		c1.setResizable(true);
-		c1.setText(Messages.getString("FeaturesBlock.0")); //$NON-NLS-1$
-
-		TableColumn c2 = new TableColumn(table, SWT.NONE);
-		c2.setWidth(100);
-		c2.setResizable(true);
-		c2.setText(Messages.getString("FeaturesBlock.1")); //$NON-NLS-1$
-
-		TableColumn c3 = new TableColumn(table, SWT.NONE);
-		c3.setWidth(200);
-		c3.setResizable(true);
-		c3.setText(Messages.getString("FeaturesBlock.2")); //$NON-NLS-1$
-
-		tViewer = new TableViewer(table);
-		tViewer.setContentProvider(new IStructuredContentProvider()
-		{
-
-			private IFeature[] features;
-
-			public Object[] getElements(Object inputElement)
-			{
-				return features;
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-				features = (IFeature[]) newInput;
-			}
-		});
-		tViewer.setLabelProvider(new ITableLabelProvider()
-		{
-
-			public Image getColumnImage(Object element, int columnIndex)
-			{
-				return null;
-			}
-
-			public String getColumnText(Object element, int columnIndex)
-			{
-				IFeature feature = (IFeature) element;
-				switch (columnIndex)
-				{
-					case 0:
-						return removeURI(feature.getURI());
-					case 1:
-						return feature.getType();
-					case 2:
-						String value = (String) featureValues.get(feature.getURI());
-						return value == null ? "" : value; //$NON-NLS-1$
-				}
-				return "!!"; //$NON-NLS-1$
-			}
-
-			private String removeURI(String uri)
-			{
-				int index = uri.lastIndexOf('/');
-				if (index > 0)
-					return uri.substring(index + 1);
-				return uri;
-			}
-
-			public void addListener(ILabelProviderListener listener)
-			{
-			}
-
-			public void dispose()
-			{
-			}
-
-			public boolean isLabelProperty(Object element, String property)
-			{
-				return false;
-			}
-
-			public void removeListener(ILabelProviderListener listener)
-			{
-			}
-
-		});
-		tViewer.setColumnProperties(new String[]
-		{ Messages.getString("FeaturesBlock.5"), Messages.getString("FeaturesBlock.6"), Messages.getString("FeaturesBlock.7") }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		final String[] valid = new String[]{null};
-		tViewer.setCellModifier(new ICellModifier()
-		{
-			public boolean canModify(Object element, String property)
-			{
-				return Messages.getString("FeaturesBlock.8").equals(property); //$NON-NLS-1$
-			}
-
-			public Object getValue(Object element, String property)
-			{
-				IFeature feature = (IFeature) element;
-				String value = (String) featureValues.get(feature.getURI());
-				return value == null ? "" : value; //$NON-NLS-1$
-			}
-
-			public void modify(Object element, String property, Object value)
-			{
-				Item item = (Item) element;
-				IFeature feature = (IFeature) item.getData();
-				if (value == null || "".equals(value)) //$NON-NLS-1$
-					featureValues.remove(feature.getURI());
-				else
-					featureValues.put(feature.getURI(), (String)value);				
-				setErrorMessage(valid[0]);
-				tViewer.update(feature, null);
-			}
-		});
-		tViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2)
-			{
-				IFeature feature1 = (IFeature) e1;
-				IFeature feature2 = (IFeature) e2;
-				return feature1.getURI().compareTo(feature2.getURI());
-			}
-		});
-
-		TextCellEditor editor = new TextCellEditor(table);
-		editor.setValidator(new ICellEditorValidator()
-		{
-
-			public String isValid(Object value)
-			{
-				IStructuredSelection sel = (IStructuredSelection) tViewer.getSelection();
-				IFeature feature = (IFeature) sel.getFirstElement();
-				IStatus validStatus = feature.validateValue((String) value);
-				if (value == null || "".equals(value)) //$NON-NLS-1$
-					valid[0] = null;
-				else if (validStatus != null && validStatus.getSeverity() == IStatus.ERROR)
-					valid[0] = validStatus.getMessage();
-				else
-					valid[0] = null;
-				return valid[0];
-			}
-		});
-
-		CellEditor[] editors = new CellEditor[]
-		{ null, null, editor };
-		tViewer.setCellEditors(editors);
-		tViewer.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				String text = null;
-				if (selection != null && selection.getFirstElement() != null)
-					text = ((IFeature) selection.getFirstElement()).getDescription();
-				descriptionText.setText(text == null ? "" : text); //$NON-NLS-1$
-			}
-		});
-
-		restoreColumnSettings();
-
-		descriptionText = new Text(parent, SWT.WRAP | SWT.BORDER | SWT.READ_ONLY | SWT.V_SCROLL);
-		gd = new GridData(SWT.FILL, SWT.NONE, true, false);
-		gd.horizontalSpan = 2;
-		gd.heightHint = 80;
-		descriptionText.setLayoutData(gd);
-	}
-
-	protected void setInput(IFeature[] input)
-	{
-		tViewer.setInput(input);
-	}
-
-	protected void setFeatureValues(Map<String, String> map)
-	{
-		this.featureValues = map;
-	}
-
-	public String getName()
-	{
-		return null;
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-	
-	@Override
-	protected void setErrorMessage(String errorMessage)
-	{
-		dialogPage.setErrorMessage(errorMessage);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/FeaturesPreferencePage.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/FeaturesPreferencePage.java
deleted file mode 100644
index 6281c8e..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/FeaturesPreferencePage.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.preferences;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ComboViewer;
-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.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-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;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.launching.IFeature;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class FeaturesPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-	private final Map<IProcessorType, Map<String, String>> typeFeatureMap = new HashMap<IProcessorType, Map<String, String>>();
-	private ComboViewer cViewer;
-	private FeaturesBlock featuresBlock;
-
-	public FeaturesPreferencePage()
-	{
-		super();
-		// only used when page is shown programatically
-		setTitle(Messages.getString("FeaturesPreferencePage.0")); //$NON-NLS-1$
-		setDescription(Messages.getString("FeaturesPreferencePage.1")); //$NON-NLS-1$
-	}
-
-	@Override
-	protected Control createContents(Composite parent)
-	{
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		parent.setLayout(layout);
-
-		Label label = new Label(parent, SWT.NULL);
-		GridData gd = new GridData(SWT.NONE, SWT.CENTER, false, false);
-		label.setText(Messages.getString("FeaturesPreferencePage.2")); //$NON-NLS-1$
-		label.setLayoutData(gd);
-
-		Combo combo = new Combo(parent, SWT.READ_ONLY | SWT.SINGLE);
-		gd = new GridData(SWT.NONE, SWT.CENTER, false, false);
-		combo.setLayoutData(gd);
-
-		cViewer = new ComboViewer(combo);
-		cViewer.setContentProvider(new IStructuredContentProvider()
-		{
-
-			private IProcessorType[] types;
-
-			public Object[] getElements(Object inputElement)
-			{
-				return types;
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-				types = (IProcessorType[]) newInput;
-			}
-		});
-		cViewer.setLabelProvider(new LabelProvider()
-		{
-			@Override
-			public String getText(Object element)
-			{
-				IProcessorType type = (IProcessorType) element;
-				return type.getLabel();
-			}
-		});
-		cViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2)
-			{
-				IProcessorType type1 = (IProcessorType) e1;
-				IProcessorType type2 = (IProcessorType) e2;
-				return type1.getLabel().compareTo(type2.getLabel());
-			}
-		});
-		cViewer.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				IProcessorType type = (IProcessorType) selection.getFirstElement();
-				if (type != null)
-				{
-					featuresBlock.setFeatureValues((Map<String, String>) typeFeatureMap.get(type));
-					featuresBlock.setInput(type.getFeatures());
-				}
-				else
-				{
-					featuresBlock.setFeatureValues(new HashMap<String, String>());
-					featuresBlock.setInput(new IFeature[0]);
-				}
-			}
-		});
-		cViewer.addFilter(new ViewerFilter()
-		{
-
-			@Override
-			public boolean select(Viewer viewer, Object parentElement, Object element)
-			{
-				IProcessorType type = (IProcessorType) element;
-				return !type.equals(XSLTRuntime.getProcessorType(XSLTRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID));
-			}
-
-		});
-
-		featuresBlock = new FeaturesBlock(this);
-		featuresBlock.createControl(parent);
-
-		setInput();
-
-		return parent;
-	}
-
-	private void setInput()
-	{
-		IProcessorType[] types = XSLTRuntime.getProcessorTypes();
-		for (IProcessorType type : types)
-		{
-			typeFeatureMap.put(type, type.getFeatureValues());
-		}
-		cViewer.setInput(XSLTRuntime.getProcessorTypes());
-		cViewer.setSelection(new StructuredSelection(getInitialType()), true);
-	}
-	
-	static IProcessorType getInitialType()
-	{
-		IProcessorInstall install = XSLTRuntime.getDefaultProcessor();
-		if (install != XSLTRuntime.getJREDefaultProcessor())
-			return install.getProcessorType();
-		return XSLTRuntime.getProcessorTypesExclJREDefault()[0];
-	}
-
-	public void init(IWorkbench workbench)
-	{
-	}
-	
-	@Override
-	protected void performDefaults()
-	{
-		IProcessorType[] types = XSLTRuntime.getProcessorTypes();
-		for (IProcessorType type : types)
-		{
-			typeFeatureMap.put(type, new HashMap<String,String>());
-		}
-		cViewer.setInput(XSLTRuntime.getProcessorTypes());
-		cViewer.setSelection(new StructuredSelection(getInitialType()), true);
-		
-		super.performDefaults();
-	}
-
-	@Override
-	public boolean performOk()
-	{
-		featuresBlock.saveColumnSettings();
-		final boolean[] ok = new boolean[1];
-		try
-		{
-			IRunnableWithProgress runnable = new IRunnableWithProgress()
-			{
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
-				{
-					try
-					{
-						XSLTRuntime.saveFeaturePreferences(typeFeatureMap,monitor);
-					}
-					catch (CoreException e)
-					{
-						XSLDebugUIPlugin.log(e);
-					}
-					ok[0] = !monitor.isCanceled();
-				}
-			};
-			XSLDebugUIPlugin.getDefault().getWorkbench().getProgressService().busyCursorWhile(runnable);
-		}
-		catch (InvocationTargetException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		catch (InterruptedException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		return ok[0];
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/InstalledProcessorsBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/InstalledProcessorsBlock.java
deleted file mode 100644
index 34aae03..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/InstalledProcessorsBlock.java
+++ /dev/null
@@ -1,661 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.preferences;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-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.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.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.window.Window;
-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.graphics.Font;
-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.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.wst.xsl.internal.debug.ui.AbstractTableBlock;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIConstants;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.InstallStandin;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.ProcessorDetailsDialog;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.ProcessorMessages;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class InstalledProcessorsBlock extends AbstractTableBlock implements ISelectionProvider
-{
-	private Composite fControl;
-	private final List<IProcessorInstall> processors = new ArrayList<IProcessorInstall>();
-	private CheckboxTableViewer tableViewer;
-	private Button fAddButton;
-	private Button fRemoveButton;
-	private Button fEditButton;
-	private final ListenerList fSelectionListeners = new ListenerList();
-	private ISelection fPrevSelection = new StructuredSelection();
-
-	public void addSelectionChangedListener(ISelectionChangedListener listener)
-	{
-		fSelectionListeners.add(listener);
-	}
-
-	public void removeSelectionChangedListener(ISelectionChangedListener listener)
-	{
-		fSelectionListeners.remove(listener);
-	}
-
-	public ISelection getSelection()
-	{
-		return new StructuredSelection(tableViewer.getCheckedElements());
-	}
-
-	public void setSelection(ISelection selection)
-	{
-		if (selection instanceof IStructuredSelection)
-		{
-			if (!selection.equals(fPrevSelection))
-			{
-				fPrevSelection = selection;
-				Object jre = ((IStructuredSelection) selection).getFirstElement();
-				if (jre == null)
-				{
-					tableViewer.setCheckedElements(new Object[0]);
-				}
-				else
-				{
-					tableViewer.setCheckedElements(new Object[]
-					{ jre });
-					tableViewer.reveal(jre);
-				}
-				fireSelectionChanged();
-			}
-		}
-	}
-
-	public void createControl(Composite ancestor)
-	{
-
-		Composite parent = new Composite(ancestor, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		parent.setLayout(layout);
-		Font font = ancestor.getFont();
-		parent.setFont(font);
-		fControl = parent;
-
-		GridData data;
-
-		Label tableLabel = new Label(parent, SWT.NONE);
-		tableLabel.setText(ProcessorMessages.InstalledProcessorsBlock_0);
-		data = new GridData();
-		data.horizontalSpan = 2;
-		tableLabel.setLayoutData(data);
-		tableLabel.setFont(font);
-
-		Table fTable = new Table(parent, SWT.CHECK | SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL);
-
-		data = new GridData(GridData.FILL_BOTH);
-		data.widthHint = 450;
-		fTable.setLayoutData(data);
-		fTable.setFont(font);
-
-		fTable.setHeaderVisible(true);
-		fTable.setLinesVisible(true);
-
-		TableColumn column1 = new TableColumn(fTable, SWT.NONE);
-		column1.setWidth(150);
-		column1.setResizable(true);
-		column1.setText(ProcessorMessages.InstalledProcessorsBlock_1);
-		column1.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				sortByName();
-			}
-		});
-
-		TableColumn column2 = new TableColumn(fTable, SWT.NONE);
-		column2.setWidth(80);
-		column2.setResizable(true);
-		column2.setText(ProcessorMessages.InstalledProcessorsBlock_2);
-		column2.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				sortByType();
-			}
-		});
-
-		TableColumn column3 = new TableColumn(fTable, SWT.NONE);
-		column3.setWidth(90);
-		column3.setResizable(true);
-		column3.setText(ProcessorMessages.InstalledProcessorsBlock_3);
-		column3.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				sortByVersion();
-			}
-		});
-
-		TableColumn column4 = new TableColumn(fTable, SWT.NONE);
-		column4.setWidth(150);
-		column4.setResizable(true);
-		column4.setText(ProcessorMessages.InstalledProcessorsBlock_4);
-		column4.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				sortByVersion();
-			}
-		});
-
-		tableViewer = new CheckboxTableViewer(fTable);
-		tableViewer.setLabelProvider(new VMLabelProvider());
-		tableViewer.setContentProvider(new ProcessorsContentProvider());
-
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-			public void selectionChanged(SelectionChangedEvent evt)
-			{
-				enableButtons();
-			}
-		});
-
-		tableViewer.addCheckStateListener(new ICheckStateListener()
-		{
-			public void checkStateChanged(CheckStateChangedEvent event)
-			{
-				if (event.getChecked())
-				{
-					setCheckedInstall((IProcessorInstall) event.getElement());
-				}
-				else
-				{
-					setCheckedInstall(null);
-				}
-			}
-		});
-
-		tableViewer.addDoubleClickListener(new IDoubleClickListener()
-		{
-			public void doubleClick(DoubleClickEvent e)
-			{
-				if (!tableViewer.getSelection().isEmpty())
-				{
-					editProcessor();
-				}
-			}
-		});
-		fTable.addKeyListener(new KeyAdapter()
-		{
-			@Override
-			public void keyPressed(KeyEvent event)
-			{
-				if (event.character == SWT.DEL && event.stateMask == 0)
-				{
-					removeProcessors();
-				}
-			}
-		});
-
-		Composite buttons = new Composite(parent, SWT.NULL);
-		buttons.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-		layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttons.setLayout(layout);
-		buttons.setFont(font);
-
-		fAddButton = createPushButton(buttons, ProcessorMessages.InstalledProcessorsBlock_5);
-		fAddButton.addListener(SWT.Selection, new Listener()
-		{
-			public void handleEvent(Event evt)
-			{
-				addProcessor();
-			}
-		});
-
-		fEditButton = createPushButton(buttons, ProcessorMessages.InstalledProcessorsBlock_6);
-		fEditButton.addListener(SWT.Selection, new Listener()
-		{
-			public void handleEvent(Event evt)
-			{
-				editProcessor();
-			}
-		});
-
-		fRemoveButton = createPushButton(buttons, ProcessorMessages.InstalledProcessorsBlock_7);
-		fRemoveButton.addListener(SWT.Selection, new Listener()
-		{
-			public void handleEvent(Event evt)
-			{
-				removeProcessors();
-			}
-		});
-
-		// copied from ListDialogField.CreateSeparator()
-		Label separator = new Label(buttons, SWT.NONE);
-		separator.setVisible(false);
-		GridData gd = new GridData();
-		gd.horizontalAlignment = GridData.FILL;
-		gd.verticalAlignment = GridData.BEGINNING;
-		gd.heightHint = 4;
-		separator.setLayoutData(gd);
-
-		fillWithWorkspaceProcessors();
-		enableButtons();
-
-		restoreColumnSettings();
-	}
-
-	protected void fillWithWorkspaceProcessors()
-	{
-		List<InstallStandin> standins = new ArrayList<InstallStandin>();
-		IProcessorType[] types = XSLTRuntime.getProcessorTypes();
-		for (IProcessorType type : types)
-		{
-			IProcessorInstall[] installs = XSLTRuntime.getProcessors(type.getId());
-			for (IProcessorInstall install : installs)
-			{
-				standins.add(new InstallStandin(install));
-			}
-		}
-		setProcessors((IProcessorInstall[]) standins.toArray(new IProcessorInstall[standins.size()]));
-	}
-
-	private void fireSelectionChanged()
-	{
-		SelectionChangedEvent event = new SelectionChangedEvent(this, getSelection());
-		Object[] listeners = fSelectionListeners.getListeners();
-		for (Object element : listeners)
-		{
-			ISelectionChangedListener listener = (ISelectionChangedListener) element;
-			listener.selectionChanged(event);
-		}
-	}
-
-	/**
-	 * Sorts by type, and name within type.
-	 */
-	private void sortByType()
-	{
-		tableViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2)
-			{
-				IProcessorInstall left = (IProcessorInstall) e1;
-				IProcessorInstall right = (IProcessorInstall) e2;
-				return left.getProcessorType().getLabel().compareToIgnoreCase(right.getProcessorType().getLabel());
-			}
-
-			@Override
-			public boolean isSorterProperty(Object element, String property)
-			{
-				return true;
-			}
-		});
-	}
-
-	private void sortByVersion()
-	{
-		tableViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2)
-			{
-				IProcessorInstall left = (IProcessorInstall) e1;
-				IProcessorInstall right = (IProcessorInstall) e2;
-				return left.getSupports().compareToIgnoreCase(right.getSupports());
-			}
-
-			@Override
-			public boolean isSorterProperty(Object element, String property)
-			{
-				return true;
-			}
-		});
-	}
-
-	/**
-	 * Sorts by name.
-	 */
-	private void sortByName()
-	{
-		tableViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2)
-			{
-				if ((e1 instanceof IProcessorInstall) && (e2 instanceof IProcessorInstall))
-				{
-					IProcessorInstall left = (IProcessorInstall) e1;
-					IProcessorInstall right = (IProcessorInstall) e2;
-					return left.getName().compareToIgnoreCase(right.getName());
-				}
-				return super.compare(viewer, e1, e2);
-			}
-
-			@Override
-			public boolean isSorterProperty(Object element, String property)
-			{
-				return true;
-			}
-		});
-	}
-
-	private void enableButtons()
-	{
-		IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection();
-		int selectionCount = selection.size();
-		fEditButton.setEnabled(selectionCount == 1);
-		if (selectionCount > 0 && selectionCount < tableViewer.getTable().getItemCount())
-		{
-			Iterator<?> iterator = selection.iterator();
-			while (iterator.hasNext())
-			{
-				IProcessorInstall install = (IProcessorInstall) iterator.next();
-				if (install.isContributed())
-				{
-					fRemoveButton.setEnabled(false);
-					return;
-				}
-			}
-			fRemoveButton.setEnabled(true);
-		}
-		else
-		{
-			fRemoveButton.setEnabled(false);
-		}
-	}
-
-	protected Button createPushButton(Composite parent, String label)
-	{
-		Button button = new Button(parent, SWT.PUSH);
-		button.setText(label);
-		return button;
-	}
-
-	@Override
-	public Control getControl()
-	{
-		return fControl;
-	}
-
-	protected void setProcessors(IProcessorInstall[] vms)
-	{
-		processors.clear();
-		for (IProcessorInstall element : vms)
-		{
-			processors.add(element);
-		}
-		tableViewer.setInput(processors);
-		// tableViewer.refresh();
-	}
-
-	public IProcessorInstall[] getProcessors()
-	{
-		return (IProcessorInstall[]) processors.toArray(new IProcessorInstall[processors.size()]);
-	}
-
-	private void addProcessor()
-	{
-		AddProcessorDialog dialog = new AddProcessorDialog(this, getShell(), XSLTRuntime.getProcessorTypesExclJREDefault(), null);
-		dialog.setTitle(ProcessorMessages.AddProcessorDialog_Add_Title);
-		if (dialog.open() != Window.OK)
-		{
-			return;
-		}
-	}
-
-	public void processorAdded(IProcessorInstall install)
-	{
-		processors.add(install);
-		tableViewer.add(install);
-		tableViewer.setSelection(new StructuredSelection(install), true);
-	}
-
-	public boolean isDuplicateName(String name)
-	{
-		for (int i = 0; i < processors.size(); i++)
-		{
-			IProcessorInstall install = (IProcessorInstall) processors.get(i);
-			if (install.getName().equals(name))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private void editProcessor()
-	{
-		IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection();
-		IProcessorInstall install = (IProcessorInstall) selection.getFirstElement();
-		if (install == null)
-		{
-			return;
-		}
-		if (install.isContributed())
-		{
-			ProcessorDetailsDialog dialog = new ProcessorDetailsDialog(getShell(), install);
-			dialog.open();
-		}
-		else
-		{
-			AddProcessorDialog dialog = new AddProcessorDialog(this, getShell(), XSLTRuntime.getProcessorTypesExclJREDefault(), install);
-			dialog.setTitle(ProcessorMessages.AddProcessorDialog_Edit_Title);
-			if (dialog.open() != Window.OK)
-			{
-				return;
-			}
-			// fillWithWorkspaceProcessors();
-			tableViewer.refresh();
-		}
-	}
-
-	private void removeProcessors()
-	{
-		IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection();
-		IProcessorInstall[] vms = new IProcessorInstall[selection.size()];
-		Iterator<?> iter = selection.iterator();
-		int i = 0;
-		while (iter.hasNext())
-		{
-			vms[i] = (IProcessorInstall) iter.next();
-			i++;
-		}
-		removeProcessors(vms);
-	}
-
-	public void removeProcessors(IProcessorInstall[] theInstalls)
-	{
-		IStructuredSelection prev = (IStructuredSelection) getSelection();
-		for (IProcessorInstall element : theInstalls)
-		{
-			processors.remove(element);
-		}
-		tableViewer.refresh();
-		IStructuredSelection curr = (IStructuredSelection) getSelection();
-		if (!curr.equals(prev))
-		{
-			IProcessorInstall[] installs = getProcessors();
-			if (curr.size() == 0 && installs.length == 1)
-			{
-				// pick a default install automatically
-				setSelection(new StructuredSelection(installs[0]));
-			}
-			else
-			{
-				fireSelectionChanged();
-			}
-		}
-	}
-
-	public void setCheckedInstall(IProcessorInstall install)
-	{
-		if (install == null)
-		{
-			setSelection(new StructuredSelection());
-		}
-		else
-		{
-			setSelection(new StructuredSelection(install));
-		}
-	}
-
-	public IProcessorInstall getCheckedInstall()
-	{
-		Object[] objects = tableViewer.getCheckedElements();
-		if (objects.length == 0)
-		{
-			return null;
-		}
-		return (IProcessorInstall) objects[0];
-	}
-
-	@Override
-	protected void setSortColumn(int column)
-	{
-		switch (column)
-		{
-			case 1:
-				sortByName();
-				break;
-			case 2:
-				sortByType();
-				break;
-		}
-		super.setSortColumn(column);
-	}
-
-	@Override
-	protected Table getTable()
-	{
-		return tableViewer.getTable();
-	}
-
-	@Override
-	protected IDialogSettings getDialogSettings()
-	{
-		return XSLDebugUIPlugin.getDefault().getDialogSettings();
-	}
-
-	@Override
-	protected String getQualifier()
-	{
-		return XSLDebugUIConstants.PROCESSOR_DETAILS_DIALOG;
-	}
-
-	public String getName()
-	{
-		return null;
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	private class ProcessorsContentProvider implements IStructuredContentProvider
-	{
-		public Object[] getElements(Object input)
-		{
-			return processors.toArray();
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-		{
-		}
-
-		public void dispose()
-		{
-		}
-	}
-
-	private class VMLabelProvider extends LabelProvider implements ITableLabelProvider
-	{
-		public String getColumnText(Object element, int columnIndex)
-		{
-			if (element instanceof IProcessorInstall)
-			{
-				IProcessorInstall install = (IProcessorInstall) element;
-				switch (columnIndex)
-				{
-					case 0:
-						return install.getName();
-					case 1:
-						return install.getProcessorType().getLabel();
-					case 2:
-						return install.getSupports();
-					case 3:
-						if (install.getDebugger() != null)
-						{
-							return install.getDebugger().getName();
-						}
-						return ProcessorMessages.InstalledProcessorsBlock_8;
-				}
-			}
-			return element.toString();
-		}
-
-		public Image getColumnImage(Object element, int columnIndex)
-		{
-			return null;
-		}
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/Messages.java
deleted file mode 100644
index 32116da..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.internal.debug.ui.preferences;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.preferences.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/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/OutputBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/OutputBlock.java
deleted file mode 100644
index 072244d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/OutputBlock.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.preferences;
-
-import java.util.Properties;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.wst.xsl.internal.debug.ui.AbstractTableBlock;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIConstants;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.launching.IOutputProperty;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-
-public class OutputBlock extends AbstractTableBlock
-{
-	private Table table;
-	private TableViewer tViewer;
-	private Properties properties;
-
-	@Override
-	protected IDialogSettings getDialogSettings()
-	{
-		return XSLDebugUIPlugin.getDefault().getDialogSettings();
-	}
-
-	@Override
-	protected String getQualifier()
-	{
-		return XSLDebugUIConstants.OUTPUT_BLOCK;
-	}
-
-	@Override
-	protected Table getTable()
-	{
-		return table;
-	}
-
-	public void createControl(Composite parent)
-	{
-		table = new Table(parent, SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL);
-		setControl(table);
-
-		table.setLinesVisible(true);
-		table.setHeaderVisible(true);
-
-		TableColumn c1 = new TableColumn(table, SWT.NONE);
-		c1.setWidth(450);
-		c1.setResizable(true);
-		c1.setText(Messages.getString("OutputBlock.0")); //$NON-NLS-1$
-
-		TableColumn c2 = new TableColumn(table, SWT.NONE);
-		c2.setWidth(150);
-		c2.setResizable(true);
-		c2.setText(Messages.getString("OutputBlock.1")); //$NON-NLS-1$
-
-		tViewer = new TableViewer(table);
-		tViewer.setContentProvider(new IStructuredContentProvider()
-		{
-
-			private IOutputProperty[] allProperties;
-
-			public Object[] getElements(Object inputElement)
-			{
-				return allProperties;
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-				allProperties = (IOutputProperty[]) newInput;
-			}
-		});
-		tViewer.setLabelProvider(new ITableLabelProvider()
-		{
-
-			public Image getColumnImage(Object element, int columnIndex)
-			{
-				return null;
-			}
-
-			public String getColumnText(Object element, int columnIndex)
-			{
-				IOutputProperty prop = (IOutputProperty) element;
-				switch (columnIndex)
-				{
-					case 0:
-						return prop.getURI();
-					case 1:
-						return (String) properties.get(prop.getURI());
-				}
-				return "!!"; //$NON-NLS-1$
-			}
-
-			public void addListener(ILabelProviderListener listener)
-			{
-			}
-
-			public void dispose()
-			{
-			}
-
-			public boolean isLabelProperty(Object element, String property)
-			{
-				return false;
-			}
-
-			public void removeListener(ILabelProviderListener listener)
-			{
-			}
-
-		});
-		tViewer.setColumnProperties(new String[]
-		{ Messages.getString("OutputBlock.2"), Messages.getString("OutputBlock.4") }); //$NON-NLS-1$ //$NON-NLS-2$
-		tViewer.setCellModifier(new ICellModifier()
-		{
-			public boolean canModify(Object element, String property)
-			{
-				return Messages.getString("OutputBlock.5").equals(property); //$NON-NLS-1$
-			}
-
-			public Object getValue(Object element, String property)
-			{
-				IOutputProperty prop = (IOutputProperty) element;
-				String value = (String) properties.get(prop.getURI());
-				return value == null ? "" : value; //$NON-NLS-1$
-			}
-
-			public void modify(Object element, String property, Object value)
-			{
-				Item item = (Item) element;
-				IOutputProperty prop = (IOutputProperty) item.getData();
-				if (value == null || "".equals(value)) //$NON-NLS-1$
-					properties.remove(prop.getURI());
-				else
-					properties.put(prop.getURI(), value);
-				tViewer.update(prop, null);
-			}
-		});
-		tViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2)
-			{
-				IOutputProperty prop1 = (IOutputProperty) e1;
-				IOutputProperty prop2 = (IOutputProperty) e2;
-				return prop1.getURI().compareTo(prop2.getURI());
-			}
-		});
-
-		TextCellEditor editor = new TextCellEditor(table);
-
-		CellEditor[] editors = new CellEditor[]
-		{ null, editor };
-		tViewer.setCellEditors(editors);
-
-		restoreColumnSettings();
-
-	}
-
-	public void addSelectionChangedListener(ISelectionChangedListener listener)
-	{
-		tViewer.addSelectionChangedListener(listener);
-	}
-
-	public void refresh()
-	{
-		tViewer.refresh();
-	}
-
-	public void setOutputPropertyValues(IProcessorType type, Properties properties)
-	{
-		this.properties = properties;
-	}
-
-	public void setInput(IOutputProperty[] keys)
-	{
-		tViewer.setInput(keys);
-	}
-
-	public String getName()
-	{
-		return null;
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/OutputPreferencePage.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/OutputPreferencePage.java
deleted file mode 100644
index 26a4866..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/OutputPreferencePage.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.preferences;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ComboViewer;
-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.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
-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;
-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;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.launching.IOutputProperty;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class OutputPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-	private ComboViewer cViewer;
-	private OutputBlock outputBlock;
-	private OutputBlock standardOutputBlock;
-	private Map<IProcessorType, Properties> typePropertyMap = new HashMap<IProcessorType, Properties>();
-	private Text descriptionText;
-
-	public OutputPreferencePage()
-	{
-		super();
-		setTitle(Messages.getString("OutputPreferencePage.0")); //$NON-NLS-1$
-		setDescription(Messages.getString("OutputPreferencePage.1")); //$NON-NLS-1$
-	}
-
-	@Override
-	protected Control createContents(Composite parent)
-	{
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		parent.setLayout(layout);
-
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(Messages.getString("OutputPreferencePage.2")); //$NON-NLS-1$
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.heightHint = 150;
-		gd.widthHint = 450;
-		gd.horizontalSpan = 2;
-		group.setLayoutData(gd);
-		group.setLayout(new GridLayout());
-
-		standardOutputBlock = new OutputBlock();
-		standardOutputBlock.createControl(group);
-		standardOutputBlock.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				String text = null;
-				if (selection != null && selection.getFirstElement() != null)
-					text = ((IOutputProperty) selection.getFirstElement()).getDescription();
-				descriptionText.setText(text == null ? "" : text); //$NON-NLS-1$
-			}
-		});
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		standardOutputBlock.getControl().setLayoutData(gd);
-
-		group = new Group(parent, SWT.NONE);
-		group.setText(Messages.getString("OutputPreferencePage.4")); //$NON-NLS-1$
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.horizontalSpan = 2;
-		group.setLayoutData(gd);
-		group.setLayout(new GridLayout(2, false));
-
-		Label label = new Label(group, SWT.NULL);
-		gd = new GridData(SWT.NONE, SWT.CENTER, false, false);
-		label.setText(Messages.getString("OutputPreferencePage.5")); //$NON-NLS-1$
-		label.setLayoutData(gd);
-
-		Combo combo = new Combo(group, SWT.READ_ONLY | SWT.SINGLE);
-		gd = new GridData(SWT.NONE, SWT.CENTER, false, false);
-		combo.setLayoutData(gd);
-
-		cViewer = new ComboViewer(combo);
-		cViewer.setContentProvider(new IStructuredContentProvider()
-		{
-
-			private IProcessorType[] types;
-
-			public Object[] getElements(Object inputElement)
-			{
-				return types;
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-				types = (IProcessorType[]) newInput;
-			}
-		});
-		cViewer.setLabelProvider(new LabelProvider()
-		{
-			@Override
-			public String getText(Object element)
-			{
-				IProcessorType type = (IProcessorType) element;
-				return type.getLabel();
-			}
-		});
-		cViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2)
-			{
-				IProcessorType type1 = (IProcessorType) e1;
-				IProcessorType type2 = (IProcessorType) e2;
-				return type1.getLabel().compareTo(type2.getLabel());
-			}
-		});
-		cViewer.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				IProcessorType type = (IProcessorType) selection.getFirstElement();
-				if (type != null)
-				{
-					outputBlock.setOutputPropertyValues(type, (Properties) typePropertyMap.get(type));
-					outputBlock.setInput(type.getOutputProperties());
-				}
-				else
-				{
-					outputBlock.setOutputPropertyValues(type, new Properties());
-					outputBlock.setInput(new IOutputProperty[0]);
-				}
-			}
-		});
-		cViewer.addFilter(new ViewerFilter()
-		{
-
-			@Override
-			public boolean select(Viewer viewer, Object parentElement, Object element)
-			{
-				IProcessorType type = (IProcessorType) element;
-				return !type.equals(XSLTRuntime.getProcessorType(XSLTRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID));
-			}
-		});
-
-		outputBlock = new OutputBlock();
-		outputBlock.createControl(group);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.horizontalSpan = 2;
-		outputBlock.getControl().setLayoutData(gd);
-		standardOutputBlock.getControl().setLayoutData(gd);
-		outputBlock.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				String text = null;
-				if (selection != null && selection.getFirstElement() != null)
-				{
-					text = ((IOutputProperty) selection.getFirstElement()).getDescription();
-				}
-				descriptionText.setText(text == null ? "" : text); //$NON-NLS-1$
-			}
-		});
-
-		descriptionText = new Text(parent, SWT.WRAP | SWT.BORDER | SWT.READ_ONLY | SWT.V_SCROLL);
-		gd = new GridData(SWT.FILL, SWT.NONE, true, false);
-		gd.horizontalSpan = 2;
-		gd.heightHint = 60;
-		descriptionText.setLayoutData(gd);
-
-		setInput();
-
-		return parent;
-	}
-
-	private void setInput()
-	{
-		IProcessorType[] types = XSLTRuntime.getProcessorTypes();
-		typePropertyMap.clear();
-		for (IProcessorType type : types)
-		{
-			typePropertyMap.put(type, (Properties)type.getOutputPropertyValues().clone());
-		}
-
-		IProcessorType jreDefaultType = XSLTRuntime.getProcessorType(XSLTRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID);
-		standardOutputBlock.setOutputPropertyValues(jreDefaultType, (Properties) typePropertyMap.get(jreDefaultType));
-		standardOutputBlock.setInput(jreDefaultType.getOutputProperties());
-
-		cViewer.setInput(types);
-		cViewer.setSelection(new StructuredSelection(FeaturesPreferencePage.getInitialType()), true);
-	}
-
-	public void init(IWorkbench workbench)
-	{
-	}
-
-	@Override
-	protected void performDefaults()
-	{
-		IProcessorType[] types = XSLTRuntime.getProcessorTypes();
-		typePropertyMap.clear();
-		for (IProcessorType type : types)
-		{
-			typePropertyMap.put(type, XSLTRuntime.createDefaultOutputProperties(type.getId()));
-		}
-
-		IProcessorType jreDefaultType = XSLTRuntime.getProcessorType(XSLTRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID);
-		standardOutputBlock.setOutputPropertyValues(jreDefaultType, (Properties) typePropertyMap.get(jreDefaultType));
-		standardOutputBlock.setInput(jreDefaultType.getOutputProperties());
-
-		cViewer.setInput(types);
-		cViewer.setSelection(new StructuredSelection(FeaturesPreferencePage.getInitialType()), true);
-
-		super.performDefaults();
-	}
-
-	@Override
-	public boolean performOk()
-	{
-		outputBlock.saveColumnSettings();
-		final boolean[] ok = new boolean[1];
-		try
-		{
-			IRunnableWithProgress runnable = new IRunnableWithProgress()
-			{
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
-				{
-					try
-					{
-						XSLTRuntime.saveOutputPropertyPreferences(typePropertyMap,monitor);
-					}
-					catch (CoreException e)
-					{
-						XSLDebugUIPlugin.log(e);
-					}
-					ok[0] = !monitor.isCanceled();
-				}
-			};
-			XSLDebugUIPlugin.getDefault().getWorkbench().getProgressService().busyCursorWhile(runnable);
-		}
-		catch (InvocationTargetException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		catch (InterruptedException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		return ok[0];
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/ProcessorLibraryBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/ProcessorLibraryBlock.java
deleted file mode 100644
index 1ac640c..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/ProcessorLibraryBlock.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.preferences;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-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.IFolder;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.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.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
-import org.eclipse.ui.dialogs.ISelectionStatusValidator;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.views.navigator.ResourceComparator;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.InstallStandin;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.JarContentProvider;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.JarLabelProvider;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.ProcessorMessages;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.IProcessorJar;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class ProcessorLibraryBlock implements SelectionListener, ISelectionChangedListener
-{
-	protected static final String LAST_PATH_SETTING = "LAST_PATH_SETTING"; //$NON-NLS-1$
-	protected static final String LAST_WORKSPACE_PATH_SETTING = "LAST_WORKSPACE_PATH_SETTING"; //$NON-NLS-1$
-	protected static final String DIALOG_SETTINGS_PREFIX = "ProcessorLibraryBlock"; //$NON-NLS-1$
-	protected InstallStandin install;
-	protected IProcessorType installType;
-	protected AddProcessorDialog addDialog = null;
-	protected TableViewer tableViewer;
-	private Button removeButton;
-	private Button addButton;
-	private Button addWorkspaceButton;
-
-	private final ISelectionStatusValidator validator = new ISelectionStatusValidator()
-	{
-		public IStatus validate(Object[] selection)
-		{
-			if (selection.length == 0)
-			{
-				return new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
-			}
-			for (Object element : selection)
-			{
-				if (element instanceof IFolder)
-					return new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
-				else if (element instanceof IFile)
-				{
-					// IFile file = (IFile) selection[i];
-					// TODO check that the file is not already on the classpath
-				}
-			}
-			return new Status(IStatus.OK, XSLDebugUIPlugin.PLUGIN_ID, 0, "", null); //$NON-NLS-1$
-		}
-	};
-
-	public ProcessorLibraryBlock(AddProcessorDialog dialog)
-	{
-		addDialog = dialog;
-	}
-
-	public Control createControl(Composite parent)
-	{
-		Font font = parent.getFont();
-
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout topLayout = new GridLayout();
-		topLayout.numColumns = 2;
-		topLayout.marginHeight = 0;
-		topLayout.marginWidth = 0;
-		comp.setLayout(topLayout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		comp.setLayoutData(gd);
-
-		tableViewer = new TableViewer(comp);
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 6;
-		tableViewer.getControl().setLayoutData(gd);
-		JarContentProvider fLibraryContentProvider = new JarContentProvider();
-		tableViewer.setContentProvider(fLibraryContentProvider);
-		tableViewer.setLabelProvider(new JarLabelProvider());
-		tableViewer.addSelectionChangedListener(this);
-
-		Composite pathButtonComp = new Composite(comp, SWT.NONE);
-		GridLayout pathButtonLayout = new GridLayout();
-		pathButtonLayout.marginHeight = 0;
-		pathButtonLayout.marginWidth = 0;
-		pathButtonComp.setLayout(pathButtonLayout);
-		gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL);
-		pathButtonComp.setLayoutData(gd);
-		pathButtonComp.setFont(font);
-
-		addWorkspaceButton = createPushButton(pathButtonComp, ProcessorMessages.ProcessorLibraryBlock_AddWorkspaceButton);
-		addWorkspaceButton.addSelectionListener(this);
-
-		addButton = createPushButton(pathButtonComp, ProcessorMessages.ProcessorLibraryBlock_AddButton);
-		addButton.addSelectionListener(this);
-
-		removeButton = createPushButton(pathButtonComp, ProcessorMessages.ProcessorLibraryBlock_RemoveButton);
-		removeButton.addSelectionListener(this);
-
-		return comp;
-	}
-
-	protected Button createPushButton(Composite parent, String label)
-	{
-		Button button = new Button(parent, SWT.PUSH);
-		button.setFont(parent.getFont());
-		button.setText(label);
-		addDialog.setButtonLayoutData(button);
-		return button;
-	}
-
-	protected void createVerticalSpacer(Composite comp, int colSpan)
-	{
-		Label label = new Label(comp, SWT.NONE);
-		GridData gd = new GridData();
-		gd.horizontalSpan = colSpan;
-		label.setLayoutData(gd);
-	}
-
-	public void initializeFrom(InstallStandin standin, IProcessorType type)
-	{
-		install = standin;
-		installType = type;
-		if (install != null)
-			tableViewer.setInput(install);
-		update();
-	}
-
-	/**
-	 * Updates buttons and status based on current libraries
-	 */
-	public void update()
-	{
-		updateButtons();
-		IStatus status = Status.OK_STATUS;
-		if (install != null && install.getProcessorJars().length == 0)
-		{
-			status = new Status(IStatus.INFO, XSLDebugUIPlugin.PLUGIN_ID, 0, ProcessorMessages.ProcessorLibraryBlock_6, null);
-		}
-		addDialog.setSystemLibraryStatus(status);
-		addDialog.updateStatusLine();
-	}
-
-	public void performApply(InstallStandin standin)
-	{
-		standin.setProcessorJars(install.getProcessorJars());
-	}
-
-	protected IProcessorInstall getVMInstall()
-	{
-		return install;
-	}
-
-	protected IProcessorType getVMInstallType()
-	{
-		return installType;
-	}
-
-	public void widgetSelected(SelectionEvent e)
-	{
-		Object source = e.getSource();
-		if (source == removeButton)
-		{
-			remove((IStructuredSelection) tableViewer.getSelection());
-		}
-		else if (source == addButton)
-		{
-			addExternal((IStructuredSelection) tableViewer.getSelection());
-		}
-		else if (source == addWorkspaceButton)
-		{
-			addWorkspace((IStructuredSelection) tableViewer.getSelection());
-		}
-		update();
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e)
-	{
-	}
-
-	private void addExternal(IStructuredSelection selection)
-	{
-		IDialogSettings dialogSettings = XSLDebugUIPlugin.getDefault().getDialogSettings();
-		String lastUsedPath = dialogSettings.get(LAST_PATH_SETTING);
-		if (lastUsedPath == null)
-		{
-			lastUsedPath = ""; //$NON-NLS-1$
-		}
-		FileDialog dialog = new FileDialog(tableViewer.getControl().getShell(), SWT.MULTI);
-		dialog.setText(ProcessorMessages.ProcessorLibraryBlock_FileDialog_Title);
-		dialog.setFilterExtensions(new String[]
-		{ "*.jar;*.zip" }); //$NON-NLS-1$
-		dialog.setFilterPath(lastUsedPath);
-		String res = dialog.open();
-		if (res == null)
-		{
-			return;
-		}
-		String[] fileNames = dialog.getFileNames();
-		int nChosen = fileNames.length;
-
-		IPath filterPath = new Path(dialog.getFilterPath());
-		IProcessorJar[] libs = new IProcessorJar[nChosen];
-		for (int i = 0; i < nChosen; i++)
-		{
-			libs[i] = XSLTRuntime.createProcessorJar(filterPath.append(fileNames[i]).makeAbsolute());
-		}
-		dialogSettings.put(LAST_PATH_SETTING, filterPath.toOSString());
-
-		IProcessorJar[] currentJars = install.getProcessorJars();
-		IProcessorJar[] newJars = new IProcessorJar[currentJars.length + libs.length];
-		System.arraycopy(currentJars, 0, newJars, 0, currentJars.length);
-		System.arraycopy(libs, 0, newJars, currentJars.length, libs.length);
-		install.setProcessorJars(newJars);
-
-		tableViewer.add(libs);
-	}
-
-	private void addWorkspace(IStructuredSelection selection)
-	{
-		IDialogSettings dialogSettings = XSLDebugUIPlugin.getDefault().getDialogSettings();
-		String lastUsedPath = dialogSettings.get(LAST_WORKSPACE_PATH_SETTING);
-		IPath lastPath = null;
-		if (lastUsedPath != null)
-		{
-			lastPath = Path.fromPortableString(lastUsedPath);
-		}
-
-		// IResource currentResource = getResource();
-		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(tableViewer.getControl().getShell(), new WorkbenchLabelProvider(), new WorkbenchContentProvider());
-		dialog.setTitle(ProcessorMessages.ProcessorLibraryBlock_WorkspaceFileDialog_Title);
-		dialog.setMessage(ProcessorMessages.ProcessorLibraryBlock_WorkspaceFileDialog_Message);
-		dialog.setValidator(validator);
-		dialog.addFilter(new ViewerFilter()
-		{
-			@Override
-			public boolean select(Viewer viewer, Object parentElement, Object element)
-			{
-				if (element instanceof IContainer)
-					return true;
-				else if (element instanceof IFile)
-				{
-					IFile file = (IFile) element;
-					String extension = file.getFileExtension();
-					if (extension == null)
-						return false;
-					return extension.equals("jar"); //$NON-NLS-1$
-				}
-				return false;
-			}
-		});
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-		if (lastPath != null)
-			dialog.setInitialSelection(lastPath);
-		dialog.setComparator(new ResourceComparator(ResourceComparator.NAME));
-		dialog.setAllowMultiple(true);
-
-		if (dialog.open() == Window.OK)
-		{
-			Object[] elements = dialog.getResult();
-			if (elements.length > 0)
-			{
-				IProcessorJar[] libs = new IProcessorJar[elements.length];
-				for (int i = 0; i < elements.length; i++)
-				{
-					IFile jar = (IFile) elements[i];
-					libs[i] = XSLTRuntime.createProcessorJar(jar.getFullPath());
-				}
-				IProcessorJar[] currentJars = install.getProcessorJars();
-				IProcessorJar[] newJars = new IProcessorJar[currentJars.length + libs.length];
-				System.arraycopy(currentJars, 0, newJars, 0, currentJars.length);
-				System.arraycopy(libs, 0, newJars, currentJars.length, libs.length);
-				install.setProcessorJars(newJars);
-
-				tableViewer.add(libs);
-
-				lastPath = libs[0].getPath();
-				lastPath = lastPath.uptoSegment(lastPath.segmentCount());
-				dialogSettings.put(LAST_WORKSPACE_PATH_SETTING, lastPath.toPortableString());
-			}
-		}
-	}
-
-	private void remove(IStructuredSelection selection)
-	{
-		List<IProcessorJar> currentJars = new ArrayList<IProcessorJar>(Arrays.asList(install.getProcessorJars()));
-		for (Iterator<?> iter = selection.iterator(); iter.hasNext();)
-		{
-			currentJars.remove(iter.next());
-		}
-		install.setProcessorJars((IProcessorJar[]) currentJars.toArray(new IProcessorJar[0]));
-		tableViewer.remove(selection.toArray());
-	}
-
-	public void selectionChanged(SelectionChangedEvent event)
-	{
-		updateButtons();
-	}
-
-	private void updateButtons()
-	{
-		IStructuredSelection selection = (IStructuredSelection) tableViewer.getSelection();
-		removeButton.setEnabled(!selection.isEmpty());
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/ProcessorsPreferencePage.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/ProcessorsPreferencePage.java
deleted file mode 100644
index 42be424..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/ProcessorsPreferencePage.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.preferences;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-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.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class ProcessorsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-	private InstalledProcessorsBlock processorsBlock;
-
-	public ProcessorsPreferencePage()
-	{
-		super();
-		// only used when page is shown programatically
-		setTitle(Messages.getString("ProcessorsPreferencePage.0")); //$NON-NLS-1$
-		setDescription(Messages.getString("ProcessorsPreferencePage.1")); //$NON-NLS-1$
-	}
-
-	public void init(IWorkbench workbench)
-	{
-	}
-
-	@Override
-	protected Control createContents(Composite ancestor)
-	{
-		initializeDialogUnits(ancestor);
-
-		noDefaultAndApplyButton();
-
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		ancestor.setLayout(layout);
-
-		processorsBlock = new InstalledProcessorsBlock();
-		processorsBlock.createControl(ancestor);
-		Control control = processorsBlock.getControl();
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.horizontalSpan = 1;
-		control.setLayoutData(data);
-
-		// TODO PlatformUI.getWorkbench().getHelpSystem().setHelp...
-
-		initDefaultInstall();
-		processorsBlock.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IProcessorInstall install = getCurrentDefaultProcessor();
-				if (install == null)
-				{
-					setValid(false);
-					setErrorMessage(Messages.getString("ProcessorsPreferencePage.2")); //$NON-NLS-1$
-				}
-				else
-				{
-					setValid(true);
-					setErrorMessage(null);
-				}
-			}
-		});
-		applyDialogFont(ancestor);
-		return ancestor;
-	}
-
-	@Override
-	public boolean performOk()
-	{
-		processorsBlock.saveColumnSettings();
-		final boolean[] ok = new boolean[1];
-		try
-		{
-			final IProcessorInstall[] installs = processorsBlock.getProcessors();
-			final IProcessorInstall defaultProcessor = getCurrentDefaultProcessor();
-			IRunnableWithProgress runnable = new IRunnableWithProgress()
-			{
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
-				{
-					try
-					{
-						XSLTRuntime.saveProcessorPreferences(installs,defaultProcessor,monitor);
-					}
-					catch (CoreException e)
-					{
-						XSLDebugUIPlugin.log(e);
-					}
-					ok[0] = !monitor.isCanceled();
-				}
-			};
-			XSLDebugUIPlugin.getDefault().getWorkbench().getProgressService().busyCursorWhile(runnable);
-		}
-		catch (InvocationTargetException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		catch (InterruptedException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		return ok[0];
-	}
-
-	private void initDefaultInstall()
-	{
-		IProcessorInstall realDefault = XSLTRuntime.getDefaultProcessor();
-		if (realDefault != null)
-		{
-			IProcessorInstall[] installs = processorsBlock.getProcessors();
-			for (IProcessorInstall fakeInstall : installs)
-			{
-				if (fakeInstall.getId().equals(realDefault.getId()))
-				{
-					verifyDefaultVM(fakeInstall);
-					break;
-				}
-			}
-		}
-	}
-
-	private void verifyDefaultVM(IProcessorInstall install)
-	{
-		if (install != null)
-		{
-			processorsBlock.setCheckedInstall(install);
-		}
-		else
-		{
-			processorsBlock.setCheckedInstall(null);
-		}
-	}
-
-	private IProcessorInstall getCurrentDefaultProcessor()
-	{
-		return processorsBlock.getCheckedInstall();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/messages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/messages.properties
deleted file mode 100644
index a2fbeca..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/preferences/messages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-FeaturesBlock.0=Feature
-FeaturesBlock.1=Type
-FeaturesBlock.2=Value
-FeaturesBlock.5=name
-FeaturesBlock.6=type
-FeaturesBlock.7=value
-FeaturesBlock.8=value
-FeaturesPreferencePage.0=Processor Features
-FeaturesPreferencePage.1=Set default values for installed processor types
-FeaturesPreferencePage.2=Processor Type: 
-OutputBlock.0=Property
-OutputBlock.1=Value
-OutputBlock.2=name
-OutputBlock.4=value
-OutputBlock.5=value
-OutputPreferencePage.0=Output Properties
-OutputPreferencePage.1=Set output properties that will be used by default for all transformations
-OutputPreferencePage.2=Standard Properties
-OutputPreferencePage.4=Processor-Specific Properties
-OutputPreferencePage.5=Processor Type:
-ProcessorsPreferencePage.0=Java XSLT Processors
-ProcessorsPreferencePage.1=Add, remove or edit XSLT processor definitions.\nBy default, the checked Processor is used for all transformations.
-ProcessorsPreferencePage.2=Select a default XSLT Processor
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/FOFormatterTab.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/FOFormatterTab.java
deleted file mode 100644
index 63708cc..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/FOFormatterTab.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.formatter;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLLaunchConfigurationTab;
-
-public class FOFormatterTab extends XSLLaunchConfigurationTab
-{
-	private final XSLFOComboBlock xslfoBlock;
-	private final RendererConfigurationBlock configBlock;
-
-	public FOFormatterTab()
-	{
-		xslfoBlock = new XSLFOComboBlock();
-		configBlock = new RendererConfigurationBlock();
-		setBlocks(new ILaunchConfigurationTab[]
-		{ configBlock });
-	}
-
-	private final IPropertyChangeListener fCheckListener = new IPropertyChangeListener()
-	{
-		public void propertyChange(PropertyChangeEvent event)
-		{
-			handleSelectionChanged();
-		}
-	};
-
-	@Override
-	public void createControl(Composite parent)
-	{
-		super.createControl(parent);
-		Composite comp = (Composite) getControl();
-
-		xslfoBlock.createControl(comp);
-		Control control = xslfoBlock.getControl();
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		control.setLayoutData(gd);
-
-		configBlock.createControl(comp);
-
-		// useful bit of code if you want to display extra options when a
-		// particular processor is chosen
-
-		// Composite dynTabComp = new Composite(topComp, SWT.NONE);
-		// dynTabComp.setFont(font);
-		//		
-		// setDynamicTabHolder(dynTabComp);
-		// GridLayout tabHolderLayout = new GridLayout();
-		// tabHolderLayout.marginHeight= 0;
-		// tabHolderLayout.marginWidth= 0;
-		// tabHolderLayout.numColumns = 1;
-		// getDynamicTabHolder().setLayout(tabHolderLayout);
-		// gd = new GridData(GridData.FILL_BOTH);
-		// getDynamicTabHolder().setLayoutData(gd);
-	}
-
-	@Override
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	@Override
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-	}
-
-	@Override
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	public String getName()
-	{
-		return "Formatter"; //$NON-NLS-1$
-	}
-
-	protected void handleSelectionChanged()
-	{
-
-		updateLaunchConfigurationDialog();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/Messages.java
deleted file mode 100644
index f5fc508..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.formatter;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.tabs.formatter.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/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/RendererConfigurationBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/RendererConfigurationBlock.java
deleted file mode 100644
index a50a1b3..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/RendererConfigurationBlock.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.formatter;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.wst.xsl.internal.debug.ui.ResourceSelectionBlock;
-
-public class RendererConfigurationBlock extends ResourceSelectionBlock
-{
-	public String getName()
-	{
-		return Messages.getString("RendererConfigurationBlock.0"); //$NON-NLS-1$
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	@Override
-	protected String getMessage(int type)
-	{
-		return "" + type; //$NON-NLS-1$
-	}
-
-	@Override
-	protected void setDefaultResource()
-	{
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/RendererTabMessages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/RendererTabMessages.java
deleted file mode 100644
index 8622e5f..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/RendererTabMessages.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.formatter;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class RendererTabMessages extends NLS
-{
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.tabs.renderer.RendererTabMessages"; //$NON-NLS-1$
-
-	public static String XSLFOComboBlock_XSLFOGroupTitle;
-
-	public static String XSLFOComboBlock_None;
-
-	public static String XSLFOComboBlock_SpecificXSLFOProcessor;
-
-	public static String XSLFOComboBlock_ManageXSLFOProcessor;
-
-	public static String OutputBlock_XMLButton;
-
-	public static String OutputBlock_FOButton;
-
-	public static String OutputBlock_HTMLButton;
-
-	public static String OutputBlock_OutputFilesGroupTitle;
-
-	public static String OutputBlock_OutputTypeGroupTitle;
-
-	public static String URIResolverBlock_Working_Directory_8;
-
-	static
-	{
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, RendererTabMessages.class);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/RendererTabMessages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/RendererTabMessages.properties
deleted file mode 100644
index ecf4248..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/RendererTabMessages.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-XSLFOComboBlock_XSLFOGroupTitle=XSLFO Processor
-XSLFOComboBlock_None=None
-XSLFOComboBlock_SpecificXSLFOProcessor=Alternate Processor:
-XSLFOComboBlock_ManageXSLFOProcessor=Installed FO Processors
-
-OutputBlock_HTMLButton=HTML
-OutputBlock_XMLButton=XML
-OutputBlock_FOButton=XSLFO (PDF/Postscript)
-OutputBlock_OutputTypeGroupTitle=Output Type
-OutputBlock_OutputFilesGroupTitle=Output File(s)
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/XSLFOComboBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/XSLFOComboBlock.java
deleted file mode 100644
index d438139..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/XSLFOComboBlock.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.formatter;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-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.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.ControlAccessibleListener;
-
-public class XSLFOComboBlock
-{
-	private Composite fControl;
-	private Button noneButton;
-	private Button alternateButton;
-	private Combo alternateCombo;
-	private Button manageButton;
-
-	public void createControl(Composite ancestor)
-	{
-		Font font = ancestor.getFont();
-		Composite comp = new Composite(ancestor, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		comp.setLayout(layout);
-		comp.setLayoutData(new GridData(GridData.FILL_BOTH));
-		comp.setFont(font);
-		fControl = comp;
-
-		Group group = new Group(comp, SWT.NULL);
-		layout = new GridLayout();
-		layout.numColumns = 3;
-		group.setLayout(layout);
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		group.setFont(font);
-
-		GridData data;
-		group.setText(RendererTabMessages.XSLFOComboBlock_XSLFOGroupTitle);
-
-		noneButton = new Button(group, SWT.RADIO);
-		noneButton.setText(RendererTabMessages.XSLFOComboBlock_None);
-		noneButton.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				if (noneButton.getSelection())
-				{
-					// setUseDefault();
-					// setStatus(OK_STATUS);
-					// firePropertyChange();
-				}
-			}
-		});
-		data = new GridData();
-		data.horizontalSpan = 3;
-		noneButton.setLayoutData(data);
-		noneButton.setFont(font);
-
-		alternateButton = new Button(group, SWT.RADIO);
-		alternateButton.setText(RendererTabMessages.XSLFOComboBlock_SpecificXSLFOProcessor);
-		alternateButton.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				if (alternateButton.getSelection())
-				{
-					// fCombo.setEnabled(true);
-					// if (fCombo.getText().length() == 0 && !fVMs.isEmpty()) {
-					// fCombo.select(0);
-					// }
-					// if (fVMs.isEmpty()) {
-					// setError(OutputTabMessages.ProcessorsComboBlock_0);
-					// } else {
-					// setStatus(OK_STATUS);
-					// }
-					// firePropertyChange();
-				}
-			}
-		});
-
-		alternateButton.setFont(font);
-		data = new GridData(GridData.BEGINNING);
-		alternateButton.setLayoutData(data);
-
-		alternateCombo = new Combo(group, SWT.DROP_DOWN | SWT.READ_ONLY);
-		alternateCombo.setFont(font);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.horizontalSpan = 1;
-		alternateCombo.setLayoutData(data);
-		ControlAccessibleListener.addListener(alternateCombo, alternateButton.getText());
-
-		alternateCombo.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				// firePropertyChange();
-			}
-		});
-
-		manageButton = new Button(group, SWT.PUSH);
-		manageButton.setText(RendererTabMessages.XSLFOComboBlock_ManageXSLFOProcessor);
-		manageButton.addListener(SWT.Selection, new Listener()
-		{
-			public void handleEvent(Event event)
-			{
-				// IPreferencePage page = new ProcessorsPreferencePage();
-				// showPrefPage("org.eclipse.wst.xslt.launching.ui.preferences.ProcessorPreferencePage",
-				// page);
-			}
-		});
-	}
-
-	public Control getControl()
-	{
-		return fControl;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/messages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/messages.properties
deleted file mode 100644
index 4b092d3..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/formatter/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-RendererConfigurationBlock.0=Configuration
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/IParametersChangedListener.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/IParametersChangedListener.java
deleted file mode 100644
index 13d8a71..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/IParametersChangedListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-public interface IParametersChangedListener
-{
-	void parametersChanged(ParameterViewer viewer);
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/IStylesheetEntriesChangedListener.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/IStylesheetEntriesChangedListener.java
deleted file mode 100644
index b1fe798..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/IStylesheetEntriesChangedListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-public interface IStylesheetEntriesChangedListener
-{
-	void entriesChanged(StylesheetViewer viewer);
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/InputFileBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/InputFileBlock.java
deleted file mode 100644
index 66eaffc..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/InputFileBlock.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.wst.xsl.internal.debug.ui.ResourceSelectionBlock;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.core.runtime.content.IContentTypeMatcher;
-
-public class InputFileBlock extends ResourceSelectionBlock
-{
-	private final IFile defaultFile;
-	IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
-
-	public InputFileBlock(IFile defaultFile)
-	{
-		super(IResource.FILE, false);
-		this.defaultFile = defaultFile;
-	}
-
-	@Override
-	protected String[] getFileExtensions()
-	{
-		IContentType contentType = contentTypeManager.getContentType("org.eclipse.wst.xml.core.xmlsource"); //$NON-NLS-1$
-		String[] xmlContentTypes = contentType.getFileSpecs(IContentType.FILE_EXTENSION_SPEC);
-		
-		return xmlContentTypes;
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-		String path = ""; //$NON-NLS-1$
-		if (defaultFile != null)
-			path = VariablesPlugin.getDefault().getStringVariableManager().generateVariableExpression("workspace_loc", defaultFile.getFullPath().toPortableString()); //$NON-NLS-1$
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, path);
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		setLaunchConfiguration(configuration);
-		try
-		{
-			String wd = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, (String) null);
-			if (wd != null)
-			{
-				setText(wd);
-			}
-		}
-		catch (CoreException e)
-		{
-			setErrorMessage(MainTabMessages.InputFileBlock_Exception_occurred_reading_configuration + e.getStatus().getMessage());
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, getText());
-	}
-
-	public String getName()
-	{
-		return MainTabMessages.InputFileBlock_Name;
-	}
-
-	@Override
-	protected void setDefaultResource()
-	{
-	}
-
-	@Override
-	protected void textModified()
-	{
-		IPath path = null;
-		String workingDirPath = getText();
-		if (workingDirPath.indexOf("${") >= 0) //$NON-NLS-1$
-		{
-			IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-			try
-			{
-				manager.validateStringVariables(workingDirPath);
-				path = new Path(manager.performStringSubstitution(workingDirPath));
-			}
-			catch (CoreException e)
-			{
-			}
-		}
-		else if (workingDirPath.length() > 0)
-		{
-			path = new Path(workingDirPath);
-		}
-	}
-
-	@Override
-	protected String getMessage(int type)
-	{
-		switch (type)
-		{
-			case ERROR_DIRECTORY_NOT_SPECIFIED:
-				return MainTabMessages.InputFileBlock_DIRECTORY_NOT_SPECIFIED;
-			case ERROR_DIRECTORY_DOES_NOT_EXIST:
-				return MainTabMessages.InputFileBlock_DIRECTORY_DOES_NOT_EXIST;
-			case GROUP_NAME:
-				return MainTabMessages.InputFileBlock_GROUP_NAME;
-			case USE_DEFAULT_RADIO:
-				return MainTabMessages.InputFileBlock_DEFAULT_RADIO;
-			case USE_OTHER_RADIO:
-				return MainTabMessages.InputFileBlock_OTHER_RADIO;
-			case DIRECTORY_DIALOG_MESSAGE:
-				return MainTabMessages.InputFileBlock_DIALOG_MESSAGE;
-			case WORKSPACE_DIALOG_MESSAGE:
-				return MainTabMessages.InputFileBlock_WORKSPACE_DIALOG_MESSAGE;
-			case VARIABLES_BUTTON:
-				return MainTabMessages.InputFileBlock_VARIABLES_BUTTON;
-			case FILE_SYSTEM_BUTTON:
-				return MainTabMessages.InputFileBlock_FILE_SYSTEM_BUTTON;
-			case WORKSPACE_BUTTON:
-				return MainTabMessages.InputFileBlock_WORKSPACE_BUTTON;
-			case WORKSPACE_DIALOG_TITLE:
-				return MainTabMessages.InputFileBlock_WORKSPACE_DIALOG_TITLE;
-		}
-		return "" + type; //$NON-NLS-1$
-	}
-
-	@Override
-	protected void updateResourceText(boolean useDefault)
-	{
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/MainTabMessages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/MainTabMessages.java
deleted file mode 100644
index 9ebd956..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/MainTabMessages.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class MainTabMessages extends NLS
-{
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.tabs.main.MainTabMessages"; //$NON-NLS-1$
-
-	public static String XSLMainTab_LabelText;
-
-	public static String StylesheetEntryLabelProvider_Invalid_path;
-
-	public static String XSLMainTab_Project_Group;
-
-	public static String XSLMainTab_Browse_Projects;
-
-	public static String XSLMainTab_Project_Does_Not_Exist;
-
-	public static String XSLMainTab_Project_Closed;
-
-	public static String XSLMainTab_Project_Name_Invalid;
-
-	public static String XSLMainTab_Choose_Project_Dialog_Title;
-
-	public static String XSLMainTab_Choose_Project_Dialog_Message;
-
-	public static String XSLMainTab_Transforms_Group;
-
-	public static String TransformsBlock_0;
-
-	public static String TransformsBlock_Name;
-
-	public static String InputFileBlock_DIRECTORY_NOT_SPECIFIED;
-
-	public static String InputFileBlock_DIRECTORY_DOES_NOT_EXIST;
-
-	public static String InputFileBlock_GROUP_NAME;
-
-	public static String InputFileBlock_DEFAULT_RADIO;
-
-	public static String InputFileBlock_OTHER_RADIO;
-
-	public static String InputFileBlock_DIALOG_MESSAGE;
-
-	public static String InputFileBlock_WORKSPACE_DIALOG_MESSAGE;
-
-	public static String InputFileBlock_VARIABLES_BUTTON;
-
-	public static String InputFileBlock_FILE_SYSTEM_BUTTON;
-
-	public static String InputFileBlock_WORKSPACE_BUTTON;
-
-	public static String InputFileBlock_Name;
-
-	public static String InputFileBlock_Exception_occurred_reading_configuration;
-
-	public static String InputFileBlock_WORKSPACE_DIALOG_TITLE;
-
-	public static String XSLMainTab_TabName;
-
-	public static String InputFileBlock_Exception_occurred_saving_configuration;
-
-	public static String OutputTypeBlock_Group_Name;
-
-	public static String OutputFileBlock_0;
-
-	public static String OutputFileBlock_7;
-
-	public static String OutputFileBlock_8;
-
-	public static String OutputFileBlock_9;
-
-	public static String OutputFileBlock_DIRECTORY_NOT_SPECIFIED;
-
-	public static String OutputFileBlock_DIRECTORY_DOES_NOT_EXIST;
-
-	public static String OutputFileBlock_GROUP_NAME;
-
-	public static String OutputFileBlock_DEFAULT_RADIO;
-
-	public static String OutputFileBlock_OTHER_RADIO;
-
-	public static String OutputFileBlock_DIALOG_MESSAGE;
-
-	public static String OutputFileBlock_WORKSPACE_DIALOG_MESSAGE;
-
-	public static String OutputFileBlock_VARIABLES_BUTTON;
-
-	public static String OutputFileBlock_FILE_SYSTEM_BUTTON;
-
-	public static String OutputFileBlock_WORKSPACE_BUTTON;
-
-	public static String OutputFileBlock_Name;
-
-	public static String OutputFileBlock_Exception_occurred_reading_configuration;
-
-	public static String OutputFileBlock_WORKSPACE_DIALOG_TITLE;
-
-	public static String OutputFileBlock_Exception_occurred_saving_configuration;
-
-	public static String OutputFOFileBlock_DIRECTORY_NOT_SPECIFIED;
-
-	public static String OutputFOFileBlock_DIRECTORY_DOES_NOT_EXIST;
-
-	public static String OutputFOFileBlock_GROUP_NAME;
-
-	public static String OutputFOFileBlock_DEFAULT_RADIO;
-
-	public static String OutputFOFileBlock_OTHER_RADIO;
-
-	public static String OutputFOFileBlock_DIALOG_MESSAGE;
-
-	public static String OutputFOFileBlock_WORKSPACE_DIALOG_MESSAGE;
-
-	public static String OutputFOFileBlock_VARIABLES_BUTTON;
-
-	public static String OutputFOFileBlock_FILE_SYSTEM_BUTTON;
-
-	public static String OutputFOFileBlock_WORKSPACE_BUTTON;
-
-	public static String OutputFOFileBlock_Name;
-
-	public static String OutputFOFileBlock_Exception_occurred_reading_configuration;
-
-	public static String OutputFOFileBlock_WORKSPACE_DIALOG_TITLE;
-
-	public static String OutputFOFileBlock_Exception_occurred_saving_configuration;
-
-	public static String TransformsBlock_ParametersLabel;
-
-	public static String TransformsBlock_StylesheetsLabel;
-
-	static
-	{
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, MainTabMessages.class);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/MainTabMessages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/MainTabMessages.properties
deleted file mode 100644
index 65129fe..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/MainTabMessages.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-XSLMainTab_LabelText=List stylesheets in the order to be applied:
-StylesheetEntryLabelProvider_Invalid_path=Invalid path
-XSLMainTab_Project_Does_Not_Exist=Project does not exist
-XSLMainTab_Project_Closed=Project is closed
-XSLMainTab_Project_Name_Invalid=Project name is invalid
-XSLMainTab_Choose_Project_Dialog_Title=Select project
-XSLMainTab_Choose_Project_Dialog_Message=Choose a project to associate with this launch configuration
-XSLMainTab_Project_Group=Project
-XSLMainTab_Browse_Projects=Browse
-XSLMainTab_TabName=Main
-
-TransformsBlock_0=TransformsBlock
-TransformsBlock_Name=Transformation Pipeline
-TransformsBlock_ParametersLabel=Parameters for stylesheet:
-TransformsBlock_StylesheetsLabel=Stylesheets:
-
-InputFileBlock_DIRECTORY_NOT_SPECIFIED=Input file not specified
-InputFileBlock_DIRECTORY_DOES_NOT_EXIST=Input file does not exist
-InputFileBlock_GROUP_NAME=XML Input File
-InputFileBlock_DEFAULT_RADIO=Use default
-InputFileBlock_OTHER_RADIO=Other
-InputFileBlock_DIALOG_MESSAGE=Select an external input file
-InputFileBlock_WORKSPACE_DIALOG_MESSAGE=Select an input file from the workspace
-InputFileBlock_VARIABLES_BUTTON=Variables...
-InputFileBlock_FILE_SYSTEM_BUTTON=File System...
-InputFileBlock_WORKSPACE_BUTTON=Workspace...
-InputFileBlock_Name=XML Input File
-InputFileBlock_Exception_occurred_reading_configuration=Exception occurred reading configuration
-InputFileBlock_Exception_occurred_saving_configuration=Exception occurred saving launch configuration
-InputFileBlock_WORKSPACE_DIALOG_TITLE=File Selection
-
-OutputTypeBlock_Group_Name=Output Type
-OutputFileBlock_0=Use default location
-OutputFileBlock_7=Location:
-OutputFileBlock_8=Open file on completion
-OutputFileBlock_9=Output File
-OutputFileBlock_DIRECTORY_NOT_SPECIFIED=Transform output file not specified
-OutputFileBlock_DIRECTORY_DOES_NOT_EXIST=Transform output file does not exist
-OutputFileBlock_GROUP_NAME=Transform Output File
-OutputFileBlock_DEFAULT_RADIO=Default
-OutputFileBlock_OTHER_RADIO=Other
-OutputFileBlock_DIALOG_MESSAGE=Select an external output file
-OutputFileBlock_WORKSPACE_DIALOG_MESSAGE=Select an output file from the workspace
-OutputFileBlock_VARIABLES_BUTTON=Variables...
-OutputFileBlock_FILE_SYSTEM_BUTTON=File System...
-OutputFileBlock_WORKSPACE_BUTTON=Workspace...
-OutputFileBlock_Name=Transform Output File
-OutputFileBlock_Exception_occurred_reading_configuration=Exception occurred reading configuration
-OutputFileBlock_Exception_occurred_saving_configuration=Exception occurred saving launch configuration
-OutputFileBlock_WORKSPACE_DIALOG_TITLE=File Selection
-
-OutputFOFileBlock_DIRECTORY_NOT_SPECIFIED=Renderer output file not specified
-OutputFOFileBlock_DIRECTORY_DOES_NOT_EXIST=Renderer output file does not exist
-OutputFOFileBlock_GROUP_NAME=Renderer Output File
-OutputFOFileBlock_DEFAULT_RADIO=Default
-OutputFOFileBlock_OTHER_RADIO=Other
-OutputFOFileBlock_DIALOG_MESSAGE=Select an external output file
-OutputFOFileBlock_WORKSPACE_DIALOG_MESSAGE=Select an output file from the workspace
-OutputFOFileBlock_VARIABLES_BUTTON=Variables...
-OutputFOFileBlock_FILE_SYSTEM_BUTTON=File System...
-OutputFOFileBlock_WORKSPACE_BUTTON=Workspace...
-OutputFOFileBlock_Name=Renderer Output File
-OutputFOFileBlock_Exception_occurred_reading_configuration=Exception occurred reading configuration
-OutputFOFileBlock_Exception_occurred_saving_configuration=Exception occurred saving launch configuration
-OutputFOFileBlock_WORKSPACE_DIALOG_TITLE=File Selection
-
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/Messages.java
deleted file mode 100644
index d437bb4..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.tabs.main.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/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParameterViewer.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParameterViewer.java
deleted file mode 100644
index 5ba94db..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParameterViewer.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.AbstractStylesheetAction;
-import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
-
-public class ParameterViewer extends TableViewer
-{
-	private final ListenerList fListeners = new ListenerList();
-
-	public ParameterViewer(Table table)
-	{
-		super(table);
-
-		table.addKeyListener(new KeyAdapter()
-		{
-			@Override
-			public void keyPressed(KeyEvent event)
-			{
-				// TODO - removal
-				// if (updateSelection(AbstractStylesheetAction.REMOVE,
-				// (IStructuredSelection)getSelection()) && event.character ==
-				// SWT.DEL && event.stateMask == 0)
-				// {
-				// List selection = getSelectionFromWidget();
-				// getStylesheetContentProvider().removeEntries((IStylesheetEntry[])selection.toArray(new
-				// IStylesheetEntry[0]));
-				// notifyChanged();
-				// }
-			}
-		});
-	}
-
-	private ParametersContentProvider getParametersContentProvider()
-	{
-		return (ParametersContentProvider) super.getContentProvider();
-	}
-
-	public Shell getShell()
-	{
-		return getControl().getShell();
-	}
-
-	public boolean isEnabled()
-	{
-		return true;
-	}
-
-	public boolean updateSelection(int actionType, IStructuredSelection selection)
-	{
-		switch (actionType)
-		{
-			case AbstractStylesheetAction.ADD:
-				return true;
-			case AbstractStylesheetAction.REMOVE:
-			case AbstractStylesheetAction.MOVE:
-			default:
-				break;
-		}
-		return selection.size() > 0;
-	}
-
-	public IStructuredSelection getSelectedEntries()
-	{
-		IStructuredSelection selection = (IStructuredSelection) getSelection();
-		return selection;
-	}
-
-	public void addParameter(LaunchAttribute parameter)
-	{
-		getParametersContentProvider().addParameter(parameter);
-		notifyChanged();
-	}
-
-	public void removeEntries(LaunchAttribute[] entries)
-	{
-		getParametersContentProvider().removeParameters(entries);
-		notifyChanged();
-	}
-
-	public LaunchAttribute[] getParameters()
-	{
-		return getParametersContentProvider().getParameters();
-	}
-
-	public void addParametersChangedListener(IParametersChangedListener listener)
-	{
-		fListeners.add(listener);
-	}
-
-	public void removeParametersChangedListener(IParametersChangedListener listener)
-	{
-		fListeners.remove(listener);
-	}
-
-	private void notifyChanged()
-	{
-		Object[] listeners = fListeners.getListeners();
-		for (Object element : listeners)
-		{
-			((IParametersChangedListener) element).parametersChanged(this);
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersBlock.java
deleted file mode 100644
index 6b84317..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersBlock.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-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.Group;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.wst.xsl.internal.debug.ui.AbstractTableBlock;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIConstants;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.AbstractParameterAction;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.AddParameterAction;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.RemoveParameterAction;
-import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class ParametersBlock extends AbstractTableBlock
-{
-	private ParameterViewer parametersViewer;
-	private Button addParameterButton;
-	private Button removeParameterButton;
-	private final TransformsBlock transformsBlock;
-	private final ISelectionChangedListener selectionListener = new ISelectionChangedListener()
-	{
-		public void selectionChanged(SelectionChangedEvent event)
-		{
-			IStructuredSelection stylesheetSelection = (IStructuredSelection) event.getSelection();
-			if (stylesheetSelection.size() == 1)
-				setTransform((LaunchTransform) stylesheetSelection.getFirstElement());
-			else
-				setTransform(null);
-			updateEnabled();
-		}
-	};
-	private Table fTable;
-
-	public ParametersBlock(TransformsBlock transformsBlock)
-	{
-		super();
-		this.transformsBlock = transformsBlock;
-	}
-
-	protected void setTransform(LaunchTransform transform)
-	{
-		parametersViewer.setInput(transform);
-	}
-
-	protected void updateEnabled()
-	{
-		IStructuredSelection stylesheetSelection = (IStructuredSelection) transformsBlock.getStylesheetViewer().getSelection();
-		boolean enabled = stylesheetSelection.size() == 1;
-		parametersViewer.getTable().setEnabled(enabled);
-		addParameterButton.setEnabled(enabled);
-		IStructuredSelection parametersSelection = (IStructuredSelection) parametersViewer.getSelection();
-		removeParameterButton.setEnabled(enabled && !parametersSelection.isEmpty());
-	}
-
-	public void createControl(Composite parent)
-	{
-		Font font = parent.getFont();
-
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(getName());
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		group.setLayoutData(gd);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		group.setLayout(layout);
-		group.setFont(font);
-
-		setControl(group);
-
-		fTable = new Table(group, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION);
-
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		// data.heightHint = 100;
-		fTable.setLayoutData(data);
-		fTable.setFont(font);
-
-		fTable.setHeaderVisible(true);
-		fTable.setLinesVisible(true);
-
-		TableColumn column1 = new TableColumn(fTable, SWT.NONE);
-		column1.setWidth(150);
-		column1.setResizable(true);
-		column1.setText(Messages.getString("ParametersBlock.0")); //$NON-NLS-1$
-		column1.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				// sortByName();
-			}
-		});
-
-		TableColumn column2 = new TableColumn(fTable, SWT.NONE);
-		column2.setWidth(50);
-		column2.setResizable(true);
-		column2.setText(Messages.getString("ParametersBlock.1")); //$NON-NLS-1$
-		column2.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				// sortByType();
-			}
-		});
-
-		TableColumn column3 = new TableColumn(fTable, SWT.NONE);
-		column3.setWidth(150);
-		column3.setResizable(true);
-		column3.setText(Messages.getString("ParametersBlock.2")); //$NON-NLS-1$
-		column3.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				// sortByType();
-			}
-		});
-
-		parametersViewer = new ParameterViewer(fTable);
-		parametersViewer.setLabelProvider(new ParametersLabelProvider());
-		parametersViewer.setContentProvider(new ParametersContentProvider());
-		parametersViewer.addParametersChangedListener(new IParametersChangedListener()
-		{
-
-			public void parametersChanged(ParameterViewer viewer)
-			{
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		parametersViewer.setColumnProperties(new String[]
-		{ Messages.getString("ParametersBlock.3"), Messages.getString("ParametersBlock.4"), Messages.getString("ParametersBlock.5") }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		final String[] types = new String[]
-		{ LaunchAttribute.TYPE_STRING, LaunchAttribute.TYPE_BOOLEAN, LaunchAttribute.TYPE_INT, LaunchAttribute.TYPE_DOUBLE, LaunchAttribute.TYPE_FLOAT, LaunchAttribute.TYPE_OBJECT,
-				LaunchAttribute.TYPE_CLASS, };
-		ComboBoxCellEditor comboEditor = new ComboBoxCellEditor(fTable, types, SWT.READ_ONLY | SWT.DROP_DOWN);
-		TextCellEditor textEditor = new TextCellEditor(fTable);
-		CellEditor[] editors = new CellEditor[]
-		{ null, comboEditor, textEditor };
-		parametersViewer.setCellEditors(editors);
-		parametersViewer.setCellModifier(new ICellModifier()
-		{
-			public boolean canModify(Object element, String property)
-			{
-				return Messages.getString("ParametersBlock.6").equals(property) || Messages.getString("ParametersBlock.7").equals(property); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			public Object getValue(Object element, String property)
-			{
-				LaunchAttribute att = (LaunchAttribute) element;
-				if (Messages.getString("ParametersBlock.8").equals(property)) //$NON-NLS-1$
-				{
-					for (int i = 0; i < types.length; i++)
-					{
-						String type = types[i];
-						if (type.equals(att.type))
-							return new Integer(i);
-					}
-					return null;
-				}
-				return att.value == null ? "" : att.value; //$NON-NLS-1$
-			}
-
-			public void modify(Object element, String property, Object value)
-			{
-				Item item = (Item) element;
-				LaunchAttribute att = (LaunchAttribute) item.getData();
-				if (Messages.getString("ParametersBlock.10").equals(property)) //$NON-NLS-1$
-				{
-					Integer v = (Integer) value;
-					att.type = types[v.intValue()];
-				}
-				else if (Messages.getString("ParametersBlock.11").equals(property)) //$NON-NLS-1$
-					att.value = (String) value;
-				parametersViewer.update(att, null);
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		Composite parameterButtonComp = new Composite(group, SWT.NONE);
-		GridLayout parameterButtonCompLayout = new GridLayout();
-		parameterButtonCompLayout.marginHeight = 0;
-		parameterButtonCompLayout.marginWidth = 0;
-		parameterButtonComp.setLayout(parameterButtonCompLayout);
-		gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL);
-		gd.horizontalSpan = 2;
-		parameterButtonComp.setLayoutData(gd);
-		parameterButtonComp.setFont(font);
-
-		addParameterButton = createButton(parameterButtonComp, new AddParameterAction(parametersViewer));
-		removeParameterButton = createButton(parameterButtonComp, new RemoveParameterAction(parametersViewer));
-
-		transformsBlock.getStylesheetViewer().addSelectionChangedListener(selectionListener);
-
-		restoreColumnSettings();
-	}
-
-	protected Button createButton(Composite pathButtonComp, AbstractParameterAction action)
-	{
-		Button button = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		return button;
-	}
-
-	@Override
-	protected void setSortColumn(int column)
-	{
-		switch (column)
-		{
-		// case 1:
-		// sortByName();
-		// break;
-		// case 2:
-		// sortByType();
-		// break;
-		}
-		super.setSortColumn(column);
-	}
-
-	@Override
-	protected Table getTable()
-	{
-		return fTable;
-	}
-
-	@Override
-	protected IDialogSettings getDialogSettings()
-	{
-		return XSLDebugUIPlugin.getDefault().getDialogSettings();
-	}
-
-	@Override
-	protected String getQualifier()
-	{
-		return XSLDebugUIConstants.MAIN_PARAMATERS_BLOCK;
-	}
-
-	public String getName()
-	{
-		return Messages.getString("ParametersBlock.9"); //$NON-NLS-1$
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		// handled by the Tab
-		updateEnabled();
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		// handled by the Tab
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-		// handled by the Tab
-	}
-
-	@Override
-	public void dispose()
-	{
-		if (transformsBlock.getStylesheetViewer() != null)
-			transformsBlock.getStylesheetViewer().removeSelectionChangedListener(selectionListener);
-		super.dispose();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersContentProvider.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersContentProvider.java
deleted file mode 100644
index 7dc8edd..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersContentProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class ParametersContentProvider implements IStructuredContentProvider
-{
-	private LaunchTransform stylesheetEntry;
-	private ParameterViewer parameterViewer;
-
-	public Object[] getElements(Object inputElement)
-	{
-		if (stylesheetEntry == null)
-			return new Object[0];
-		return stylesheetEntry.getParameters().toArray();
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-	{
-		stylesheetEntry = (LaunchTransform) newInput;
-		parameterViewer = (ParameterViewer) viewer;
-	}
-
-	public void dispose()
-	{
-	}
-
-	public LaunchAttribute[] getParameters()
-	{
-		return (LaunchAttribute[]) stylesheetEntry.getParameters().toArray(new LaunchAttribute[0]);
-	}
-
-	public void removeParameters(LaunchAttribute[] entries)
-	{
-		for (LaunchAttribute parameter : entries)
-		{
-			stylesheetEntry.getParameters().remove(parameter);
-		}
-		TableItem[] items = parameterViewer.getTable().getItems();
-		List<LaunchAttribute> entryList = Arrays.asList(entries);
-		Object sel = null;
-		for (int i = items.length - 1; i >= 0; i--)
-		{
-			TableItem item = items[i];
-			if (!entryList.contains(item.getData()))
-			{
-				sel = item.getData();
-				break;
-			}
-		}
-		parameterViewer.remove(entries);
-
-		if (sel != null)
-			parameterViewer.setSelection(new StructuredSelection(sel), true);
-	}
-
-	public void addParameter(LaunchAttribute parameter)
-	{
-		stylesheetEntry.getParameters().add(parameter);
-		parameterViewer.add(parameter);
-		parameterViewer.setSelection(new StructuredSelection(parameter), true);
-		// parameterViewer.refresh();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersLabelProvider.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersLabelProvider.java
deleted file mode 100644
index 9c9cc9c..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersLabelProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
-
-public class ParametersLabelProvider implements ITableLabelProvider
-{
-	public String getColumnText(Object element, int columnIndex)
-	{
-		LaunchAttribute p = (LaunchAttribute) element;
-		switch (columnIndex)
-		{
-			case 0:
-				return p.uri;
-			case 1:
-				return p.type;
-			case 2:
-				return p.value;
-		}
-		return "!"; //$NON-NLS-1$
-	}
-
-	public Image getColumnImage(Object element, int columnIndex)
-	{
-		return null;
-	}
-
-	public void addListener(ILabelProviderListener listener)
-	{
-	}
-
-	public void dispose()
-	{
-	}
-
-	public boolean isLabelProperty(Object element, String property)
-	{
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener)
-	{
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetContentProvider.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetContentProvider.java
deleted file mode 100644
index 17c34ad..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetContentProvider.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.xsl.launching.config.LaunchPipeline;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class StylesheetContentProvider implements IStructuredContentProvider
-{
-	private TableViewer tableViewer;
-	private LaunchPipeline pipeline;
-
-	public StylesheetContentProvider()
-	{
-	}
-
-	public Object[] getElements(Object inputElement)
-	{
-		return pipeline.getTransformDefs().toArray(new LaunchTransform[0]);
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-	{
-		tableViewer = (TableViewer) viewer;
-		pipeline = (LaunchPipeline) newInput;
-	}
-
-	public void dispose()
-	{
-	}
-
-	public void setEntries(LaunchTransform[] transforms)
-	{
-		pipeline.setTransformDefs(new ArrayList<LaunchTransform>(Arrays.asList(transforms)));
-		tableViewer.refresh();
-	}
-
-	public void addEntries(LaunchTransform[] res, Object beforeElement)
-	{
-		for (LaunchTransform transform : res)
-		{
-			pipeline.addTransformDef(transform);
-		}
-		tableViewer.add(res);
-		// select the first new one
-		tableViewer.setSelection(new StructuredSelection(res[0]), true);
-	}
-
-	public void removeEntries(LaunchTransform[] res)
-	{
-		for (LaunchTransform transform : res)
-		{
-			pipeline.removeTransformDef(transform);
-		}
-		tableViewer.refresh();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetLabelProvider.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetLabelProvider.java
deleted file mode 100644
index 801e375..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetLabelProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import java.io.File;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class StylesheetLabelProvider extends LabelProvider
-{
-	@Override
-	public Image getImage(Object element)
-	{
-		return null;
-	}
-
-	@Override
-	public String getText(Object element)
-	{
-		LaunchTransform lt = (LaunchTransform) element;
-		int index = lt.getPipeline().getTransformDefs().indexOf(lt);
-
-		IPath path;
-		try
-		{
-			path = lt.getPath();
-		}
-		catch (CoreException e)
-		{
-			return MessageFormat.format(MainTabMessages.StylesheetEntryLabelProvider_Invalid_path, new String[]
-			{ "null" }); //$NON-NLS-1$
-		}
-
-		if (path == null)
-		{
-			return MessageFormat.format(MainTabMessages.StylesheetEntryLabelProvider_Invalid_path, new String[]
-			{ "null" }); //$NON-NLS-1$
-		}
-		else if (!path.isAbsolute() || !path.isValidPath(path.toString()))
-		{
-			return MessageFormat.format(MainTabMessages.StylesheetEntryLabelProvider_Invalid_path, new String[]
-			{ path.toString() });
-		}
-
-		String[] segments = path.segments();
-		StringBuffer displayPath = new StringBuffer();
-		if (segments.length > 0)
-		{
-			displayPath.append(segments[segments.length - 1]);
-			displayPath.append(" - "); //$NON-NLS-1$
-			String device = path.getDevice();
-			if (device != null)
-			{
-				displayPath.append(device);
-			}
-			displayPath.append(File.separator);
-			for (int i = 0; i < segments.length - 1; i++)
-			{
-				displayPath.append(segments[i]).append(File.separator);
-			}
-		}
-		else
-		{
-			displayPath.append(path.toString());
-		}
-		return (index + 1) + ") " + displayPath.toString(); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetViewer.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetViewer.java
deleted file mode 100644
index 9030d6b..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetViewer.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.AbstractStylesheetAction;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class StylesheetViewer extends TableViewer
-{
-	private final ListenerList listenerList = new ListenerList();
-
-	public StylesheetViewer(Composite parent)
-	{
-		super(parent);
-
-		getTable().addKeyListener(new KeyAdapter()
-		{
-			@Override
-			public void keyPressed(KeyEvent event)
-			{
-				if (updateSelection(AbstractStylesheetAction.REMOVE, (IStructuredSelection) getSelection()) && event.character == SWT.DEL && event.stateMask == 0)
-				{
-					List<?> selection = getSelectionFromWidget();
-					getStylesheetContentProvider().removeEntries((LaunchTransform[]) selection.toArray(new LaunchTransform[0]));
-					notifyChanged();
-				}
-			}
-		});
-	}
-
-	private StylesheetContentProvider getStylesheetContentProvider()
-	{
-		return (StylesheetContentProvider) super.getContentProvider();
-	}
-
-	public void setEntries(LaunchTransform[] transforms)
-	{
-		getStylesheetContentProvider().setEntries(transforms);
-		notifyChanged();
-	}
-
-	public LaunchTransform[] getEntries()
-	{
-		return (LaunchTransform[]) getStylesheetContentProvider().getElements(null);
-	}
-
-	public Shell getShell()
-	{
-		return getControl().getShell();
-	}
-
-	public boolean isEnabled()
-	{
-		return true;
-	}
-
-	public boolean updateSelection(int actionType, IStructuredSelection selection)
-	{
-		switch (actionType)
-		{
-			case AbstractStylesheetAction.ADD:
-				return true;
-			case AbstractStylesheetAction.REMOVE:
-			case AbstractStylesheetAction.MOVE:
-			default:
-				break;
-		}
-		return selection.size() > 0;
-	}
-
-	public IStructuredSelection getSelectedEntries()
-	{
-		IStructuredSelection selection = (IStructuredSelection) getSelection();
-		return selection;
-	}
-
-	public void addTransforms(LaunchTransform[] res)
-	{
-		IStructuredSelection sel = (IStructuredSelection) getSelection();
-		Object beforeElement = sel.getFirstElement();
-		if (getEntries().length > 1 && beforeElement == null)
-			beforeElement = getEntries()[getEntries().length - 1];
-		getStylesheetContentProvider().addEntries(res, beforeElement);
-		notifyChanged();
-	}
-
-	public void removeEntries(LaunchTransform[] entries)
-	{
-		getStylesheetContentProvider().removeEntries(entries);
-		notifyChanged();
-	}
-
-	public void addEntriesChangedListener(IStylesheetEntriesChangedListener listener)
-	{
-		listenerList.add(listener);
-	}
-
-	public void removeEntriesChangedListener(IStylesheetEntriesChangedListener listener)
-	{
-		listenerList.remove(listener);
-	}
-
-	private void notifyChanged()
-	{
-		Object[] listeners = listenerList.getListeners();
-		for (Object element : listeners)
-		{
-			((IStylesheetEntriesChangedListener) element).entriesChanged(this);
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/TransformsBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/TransformsBlock.java
deleted file mode 100644
index d358bbd..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/TransformsBlock.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-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.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.wst.xsl.internal.debug.ui.AbstractTableBlock;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIConstants;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.AbstractStylesheetAction;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.AddExternalFileAction;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.AddWorkspaceFileAction;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.MoveDownAction;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.MoveUpAction;
-import org.eclipse.wst.xsl.internal.debug.ui.actions.RemoveAction;
-import org.eclipse.wst.xsl.launching.config.LaunchPipeline;
-
-public class TransformsBlock extends AbstractTableBlock implements IStylesheetEntriesChangedListener
-{
-	protected static final String DIALOG_SETTINGS_PREFIX = MainTabMessages.TransformsBlock_0;
-	private StylesheetViewer stylesheetViewer;
-	private LaunchPipeline pipeline;
-
-	public TransformsBlock()
-	{
-		super();
-	}
-
-	public void createControl(Composite parent)
-	{
-		Font font = parent.getFont();
-
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(getName());
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		group.setLayoutData(gd);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		group.setLayout(layout);
-		group.setFont(font);
-
-		setControl(group);
-
-		stylesheetViewer = new StylesheetViewer(group);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		stylesheetViewer.getTable().setLayoutData(gd);
-		stylesheetViewer.addEntriesChangedListener(this);
-		stylesheetViewer.getControl().setFont(font);
-		stylesheetViewer.setLabelProvider(new StylesheetLabelProvider());
-		stylesheetViewer.setContentProvider(new StylesheetContentProvider());
-
-		Composite upDownButtonComp = new Composite(group, SWT.NONE);
-		GridLayout upDownButtonLayout = new GridLayout();
-		upDownButtonLayout.marginHeight = 0;
-		upDownButtonLayout.marginWidth = 0;
-		upDownButtonComp.setLayout(upDownButtonLayout);
-		gd = new GridData(SWT.FILL, SWT.FILL, false, true);
-		upDownButtonComp.setLayoutData(gd);
-		upDownButtonComp.setFont(font);
-
-		createArrowButton(upDownButtonComp, new MoveUpAction(stylesheetViewer), SWT.UP);
-		Label spacer = new Label(upDownButtonComp, SWT.NONE);
-		gd = new GridData(SWT.NONE, SWT.FILL, false, true);
-		spacer.setLayoutData(gd);
-		createArrowButton(upDownButtonComp, new MoveDownAction(stylesheetViewer), SWT.DOWN);
-
-		Composite pathButtonComp = new Composite(group, SWT.NONE);
-		GridLayout pathButtonLayout = new GridLayout();
-		pathButtonLayout.marginHeight = 0;
-		pathButtonLayout.marginWidth = 0;
-		pathButtonComp.setLayout(pathButtonLayout);
-		gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_FILL);
-		pathButtonComp.setLayoutData(gd);
-		pathButtonComp.setFont(font);
-
-		createButton(pathButtonComp, new AddWorkspaceFileAction(stylesheetViewer));
-		createButton(pathButtonComp, new AddExternalFileAction(stylesheetViewer, DIALOG_SETTINGS_PREFIX));
-		// TODO
-		// createButton(pathButtonComp, new
-		// SetURIResolverAction(stylesheetViewer));
-		createButton(pathButtonComp, new RemoveAction(stylesheetViewer));
-	}
-
-	public Viewer getStylesheetViewer()
-	{
-		return stylesheetViewer;
-	}
-
-	protected Button createArrowButton(Composite pathButtonComp, AbstractStylesheetAction action, int updown)
-	{
-		Button b = new Button(pathButtonComp, SWT.ARROW | updown);
-		GridData gd = new GridData();
-		b.setLayoutData(gd);
-		action.setButton(b);
-		return b;
-	}
-
-	protected Button createButton(Composite pathButtonComp, AbstractStylesheetAction action)
-	{
-		Button button = createPushButton(pathButtonComp, action.getText(), null);
-		action.setButton(button);
-		return button;
-	}
-
-	public String getName()
-	{
-		return MainTabMessages.TransformsBlock_Name;
-	}
-
-	public void setPipeline(LaunchPipeline pipeline)
-	{
-		this.pipeline = pipeline;
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		stylesheetViewer.setInput(pipeline);
-		if (pipeline.getTransformDefs().size() > 0)
-		{
-			stylesheetViewer.setSelection(new StructuredSelection(pipeline.getTransformDefs().get(0)));
-		}
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	public void entriesChanged(StylesheetViewer viewer)
-	{
-		setDirty(true);
-		updateLaunchConfigurationDialog();
-	}
-
-	@Override
-	protected void setSortColumn(int column)
-	{
-		switch (column)
-		{
-		// case 1:
-		// sortByName();
-		// break;
-		// case 2:
-		// sortByType();
-		// break;
-		}
-		super.setSortColumn(column);
-	}
-
-	@Override
-	protected Table getTable()
-	{
-		return stylesheetViewer == null ? null : stylesheetViewer.getTable();
-	}
-
-	@Override
-	protected IDialogSettings getDialogSettings()
-	{
-		return XSLDebugUIPlugin.getDefault().getDialogSettings();
-	}
-
-	@Override
-	protected String getQualifier()
-	{
-		return XSLDebugUIConstants.MAIN_TRANSFORMS_BLOCK;
-	}
-
-	@Override
-	public void dispose()
-	{
-		if (stylesheetViewer != null)
-			stylesheetViewer.removeEntriesChangedListener(this);
-		super.dispose();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/XSLMainTab.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/XSLMainTab.java
deleted file mode 100644
index 49b3fd5..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/XSLMainTab.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.main;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-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.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLLaunchConfigurationTab;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.config.LaunchPipeline;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class XSLMainTab extends XSLLaunchConfigurationTab
-{
-	private final InputFileBlock inputFileBlock;
-	private final TransformsBlock transformsBlock;
-	private final ParametersBlock parametersBlock;
-	public LaunchPipeline pipeline;
-
-	// private RenderBlock renderBlock;
-	// private OutputBlock outputBlock;
-
-	public XSLMainTab()
-	{
-		IResource[] resourceContext = getContext();
-		IFile inputFile = getXMLInput(resourceContext);
-
-		inputFileBlock = new InputFileBlock(inputFile);
-		transformsBlock = new TransformsBlock();
-		parametersBlock = new ParametersBlock(transformsBlock);
-		// renderBlock = new RenderBlock();
-		// outputBlock = new OutputBlock();
-
-		setBlocks(new ILaunchConfigurationTab[]
-		{ inputFileBlock, transformsBlock, parametersBlock }); // ,renderBlock,outputBlock});
-	}
-
-	@Override
-	public void createControl(Composite parent)
-	{
-		super.createControl(parent);
-		Composite comp = (Composite) getControl();
-		GridLayout layout = new GridLayout(1, false);
-		comp.setLayout(layout);
-
-		inputFileBlock.createControl(comp);
-		transformsBlock.createControl(comp);
-		parametersBlock.createControl(comp);
-		// renderBlock.createControl(comp);
-		// outputBlock.createControl(comp);
-	}
-
-	@Override
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-		LaunchPipeline lp = new LaunchPipeline();
-		IResource[] resourceContext = getContext();
-		IFile[] stylesheets = getXSLStylesheets(resourceContext);
-		for (IFile file : stylesheets)
-		{
-			LaunchTransform lt = new LaunchTransform(file.getFullPath().toPortableString(), LaunchTransform.RESOURCE_TYPE);
-			lp.addTransformDef(lt);
-		}
-		savePipeline(configuration, lp);
-		super.setDefaults(configuration);
-	}
-
-	@Override
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		pipeline = null;
-		try
-		{
-			String s = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PIPELINE, (String) null);
-			if (s != null && s.length() > 0)
-			{
-				ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes());
-				pipeline = LaunchPipeline.fromXML(inputStream);
-			}
-			else
-			{
-				pipeline = new LaunchPipeline();
-			}
-		}
-		catch (CoreException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		transformsBlock.setPipeline(pipeline);
-		super.initializeFrom(configuration);
-	}
-
-	@Override
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		super.performApply(configuration);
-		savePipeline(configuration, pipeline);
-	}
-
-	private void savePipeline(ILaunchConfigurationWorkingCopy configuration, LaunchPipeline pipeline)
-	{
-		try
-		{
-			configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_PIPELINE, pipeline.toXML());
-		}
-		catch (CoreException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	public String getName()
-	{
-		return MainTabMessages.XSLMainTab_TabName;
-	}
-
-	private static IResource[] getContext()
-	{
-
-		// IProject[] projects =
-		// ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		// project.setInput( projects);
-		// String s = configuration.getAttribute(
-		// IXSLTLaunchConfiguration.PROJECT, "");
-		// IProject project = null;
-		// if( s.equals(""))
-		// {
-		// if( projects.length>0)
-		// {
-		// project = projects[ 0];
-		// }
-		// }
-		// else
-		// project = ResourcesPlugin.getWorkspace().getRoot().getProject( s);
-
-		IWorkbenchPage page = XSLDebugUIPlugin.getActivePage();
-		List<Object> resources = new ArrayList<Object>();
-		if (page != null)
-		{
-			// use selections to find the project
-			ISelection selection = page.getSelection();
-			if (selection != null && !selection.isEmpty() && selection instanceof IStructuredSelection)
-			{
-				IStructuredSelection ss = (IStructuredSelection) selection;
-				for (Iterator<?> iter = ss.iterator(); iter.hasNext();)
-				{
-					Object element = iter.next();
-					if (element instanceof IResource)
-						resources.add(element);
-				}
-				return (IResource[]) resources.toArray(new IResource[0]);
-			}
-			// use current editor to find the project
-			IEditorPart part = page.getActiveEditor();
-			if (part != null)
-			{
-				IEditorInput input = part.getEditorInput();
-				IFile file = (IFile) input.getAdapter(IFile.class);
-				if (file != null)
-					return new IResource[]
-					{ file };
-			}
-		}
-		return new IResource[0];
-	}
-
-	private IFile getXMLInput(IResource[] context)
-	{
-		for (IResource resource : context)
-		{
-			if (resource instanceof IFile && ("xml".equalsIgnoreCase(resource.getFileExtension()) || "xhtml".equalsIgnoreCase(resource.getFileExtension()))) //$NON-NLS-1$ //$NON-NLS-2$
-				return (IFile) resource;
-		}
-		return null;
-	}
-
-	private IFile[] getXSLStylesheets(IResource[] context)
-	{
-		List<IResource> stylesheets = new ArrayList<IResource>();
-		for (IResource resource : context)
-		{
-			if (resource instanceof IFile && "xsl".equalsIgnoreCase(resource.getFileExtension())) //$NON-NLS-1$
-				stylesheets.add(resource);
-		}
-		return (IFile[]) stylesheets.toArray(new IFile[0]);
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/messages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/messages.properties
deleted file mode 100644
index b6a38df..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/messages.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-ParametersBlock.0=Name
-ParametersBlock.1=Type
-ParametersBlock.10=type
-ParametersBlock.11=value
-ParametersBlock.2=Value
-ParametersBlock.3=name
-ParametersBlock.4=type
-ParametersBlock.5=value
-ParametersBlock.6=type
-ParametersBlock.7=value
-ParametersBlock.8=type
-ParametersBlock.9=Transformation Parameters
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/Messages.java
deleted file mode 100644
index 187fede..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/Messages.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.output;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.tabs.output.messages"; //$NON-NLS-1$
-	public static String OutputPropertiesBlock_0;
-	public static String OutputPropertiesBlock_1;
-	public static String OutputPropertiesBlock_13;
-	public static String OutputPropertiesBlock_3;
-	public static String OutputPropertiesBlock_4;
-	public static String OutputPropertiesBlock_5;
-	public static String OutputPropertiesBlock_7;
-	public static String OutputPropertiesBlock_8;
-	public static String OutputPropertiesBlock_9;
-	public static String OutputTab_0;
-	public static String OutputTab_1;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/OutputFileBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/OutputFileBlock.java
deleted file mode 100644
index 065e39d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/OutputFileBlock.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.output;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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.wst.xsl.internal.debug.ui.ResourceSelectionBlock;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.MainTabMessages;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-
-public class OutputFileBlock extends ResourceSelectionBlock
-{
-	public static final String OUTPUT_METHOD_DEFAULT = "<Default>"; //$NON-NLS-1$
-	public static final String OUTPUT_METHOD_XML = "xml"; //$NON-NLS-1$
-	public static final String OUTPUT_METHOD_XHTML = "xhtml"; //$NON-NLS-1$
-	public static final String OUTPUT_METHOD_HTML = "html"; //$NON-NLS-1$
-	public static final String OUTPUT_METHOD_TEXT = "text"; //$NON-NLS-1$
-
-	public static final String[] OUTPUT_METHODS = new String[]
-	{ OUTPUT_METHOD_DEFAULT, OUTPUT_METHOD_XML, OUTPUT_METHOD_XHTML, OUTPUT_METHOD_HTML, OUTPUT_METHOD_TEXT };
-	private Button openFileCheckButton;
-	// private ComboViewer formatViewer;
-	// private Combo formatCombo;
-	private ComboViewer methodViewer;
-	private String inputFilename;
-
-	public OutputFileBlock()
-	{
-		super(IResource.FILE, true, true, false);
-	}
-
-	@Override
-	protected String getMessage(int type)
-	{
-		switch (type)
-		{
-			case ERROR_DIRECTORY_NOT_SPECIFIED:
-				return MainTabMessages.OutputFOFileBlock_DIRECTORY_NOT_SPECIFIED;
-			case ERROR_DIRECTORY_DOES_NOT_EXIST:
-				return MainTabMessages.OutputFOFileBlock_DIRECTORY_DOES_NOT_EXIST;
-			case GROUP_NAME:
-				return getName();
-			case USE_DEFAULT_RADIO:
-				return MainTabMessages.OutputFileBlock_0;
-			case USE_OTHER_RADIO:
-				return MainTabMessages.OutputFOFileBlock_OTHER_RADIO;
-			case DIRECTORY_DIALOG_MESSAGE:
-				return MainTabMessages.OutputFOFileBlock_DIALOG_MESSAGE;
-			case WORKSPACE_DIALOG_MESSAGE:
-				return MainTabMessages.OutputFOFileBlock_WORKSPACE_DIALOG_MESSAGE;
-			case VARIABLES_BUTTON:
-				return MainTabMessages.OutputFOFileBlock_VARIABLES_BUTTON;
-			case FILE_SYSTEM_BUTTON:
-				return MainTabMessages.OutputFOFileBlock_FILE_SYSTEM_BUTTON;
-			case WORKSPACE_BUTTON:
-				return MainTabMessages.OutputFOFileBlock_WORKSPACE_BUTTON;
-			case WORKSPACE_DIALOG_TITLE:
-				return MainTabMessages.OutputFOFileBlock_WORKSPACE_DIALOG_TITLE;
-		}
-		return "" + type; //$NON-NLS-1$
-	}
-
-	@Override
-	protected void setDefaultResource()
-	{}
-
-	@Override
-	protected void createContents(Composite parent)
-	{
-		// Composite comp = new Composite(parent,SWT.NONE);
-		// GridData gd = new GridData(SWT.FILL,SWT.FILL,true,false);
-		// gd.horizontalSpan = 2;
-		// comp.setLayoutData(gd);
-		// GridLayout layout = new GridLayout(2,true);
-		// layout.marginHeight = 0;
-		// layout.marginWidth = 0;
-		// comp.setLayout(layout);
-
-		// createMethodCombo(comp);
-		// createFormatCombo(comp);
-
-		// methodViewer.setInput("");
-		// formatViewer.setInput("");
-
-		// methodViewer.setSelection(new StructuredSelection("xml"), true);
-		// formatViewer.setSelection(new StructuredSelection("<none>"), true);
-
-		fileLabel = MainTabMessages.OutputFileBlock_7;
-		createCheckboxAndText(parent);
-		createButtons(parent);
-	}
-
-	@Override
-	protected void createButtons(Composite parent)
-	{
-		openFileCheckButton = createCheckButton(parent, MainTabMessages.OutputFileBlock_8);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 1;
-		openFileCheckButton.setLayoutData(gd);
-		openFileCheckButton.addSelectionListener(new SelectionListener()
-		{
-
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-
-			public void widgetSelected(SelectionEvent e)
-			{
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		Composite buttonComp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(3, false);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttonComp.setLayout(layout);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		gd.horizontalSpan = 1;
-		buttonComp.setLayoutData(gd);
-		buttonComp.setFont(parent.getFont());
-
-		fWorkspaceButton = createPushButton(buttonComp, getMessage(WORKSPACE_BUTTON), null);
-		fWorkspaceButton.addSelectionListener(widgetListener);
-
-		fFileSystemButton = createPushButton(buttonComp, getMessage(FILE_SYSTEM_BUTTON), null);
-		fFileSystemButton.addSelectionListener(widgetListener);
-
-		fVariablesButton = createPushButton(buttonComp, getMessage(VARIABLES_BUTTON), null);
-		fVariablesButton.addSelectionListener(widgetListener);
-	}
-
-	public String getName()
-	{
-		return MainTabMessages.OutputFileBlock_9;
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		try
-		{
-			String outputMethod = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_METHOD, OUTPUT_METHODS[0]);
-			// methodViewer.setSelection(new StructuredSelection(outputMethod),
-			// true);
-
-			inputFilename = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, ""); //$NON-NLS-1$
-			// String renderTo =
-			// configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_RENDER_TO,
-			// "");
-			updateDefaultOutputFile();
-
-			boolean useDefault = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_OUTPUT_FILE, true);
-			useDefaultCheckButton.setSelection(useDefault);
-
-			outputFile = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_FILE, defaultOutputFile);
-
-			updateResourceText(useDefault);
-
-			boolean openFileOnCompletion = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_OPEN_FILE, true);
-			openFileCheckButton.setSelection(openFileOnCompletion);
-		}
-		catch (CoreException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		boolean useDefault = useDefaultCheckButton.getSelection();
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_OUTPUT_FILE, useDefault);
-
-		String outputFile = resourceText.getText();
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_FILE, outputFile);
-
-		// String outputMethod =
-		// (String)((IStructuredSelection)methodViewer.getSelection()).getFirstElement();
-		// outputMethod = outputMethod == OUTPUT_METHODS[0] ? null :
-		// outputMethod;
-		// configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_METHOD,
-		// outputMethod);
-
-		boolean openFileOnCompletion = openFileCheckButton.getSelection();
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OPEN_FILE, openFileOnCompletion);
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_OUTPUT_FILE, true);
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_FILE, ""); //$NON-NLS-1$
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_METHOD, (String) null);
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OPEN_FILE, true);
-	}
-
-	public void updateDefaultOutputFile()
-	{
-		String method = OUTPUT_METHOD_XML;
-		if (methodViewer != null)
-			method = (String) ((IStructuredSelection) methodViewer.getSelection()).getFirstElement();
-		if (OUTPUT_METHOD_DEFAULT.equals(method))
-			method = OUTPUT_METHOD_XML;
-
-		String file = inputFilename;
-		int index = inputFilename.lastIndexOf('.');
-		if (index != -1)
-			file = inputFilename.substring(0, index);
-		file += ".out." + method; //$NON-NLS-1$
-		if (inputFilename.trim().endsWith("}")) //$NON-NLS-1$
-			file += "}"; //$NON-NLS-1$
-
-		defaultOutputFile = file;
-
-		updateResourceText(openFileCheckButton.getSelection());
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/OutputPropertiesBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/OutputPropertiesBlock.java
deleted file mode 100644
index 54c3494..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/OutputPropertiesBlock.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.output;
-
-import java.io.ByteArrayInputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-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.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-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.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xsl.internal.debug.ui.AbstractTableBlock;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIConstants;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.preferences.OutputPreferencePage;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.XSLMainTab;
-import org.eclipse.wst.xsl.launching.IOutputProperty;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-import org.eclipse.wst.xsl.launching.config.LaunchProperties;
-
-public class OutputPropertiesBlock extends AbstractTableBlock
-{
-	private Table table;
-	private TableViewer tViewer;
-	private Text descriptionText;
-	private IProcessorType processorType;
-	private final Map<IProcessorType, LaunchProperties> typeProperties = new HashMap<IProcessorType, LaunchProperties>();
-	private Button usePropertiesFromPreferencesRadio;
-	private Button changePreferences;
-	private Button useSpecificPropertiesRadio;
-	private LaunchProperties launchProperties;
-
-	public OutputPropertiesBlock(XSLMainTab main)
-	{
-	}
-
-	@Override
-	protected IDialogSettings getDialogSettings()
-	{
-		return XSLDebugUIPlugin.getDefault().getDialogSettings();
-	}
-
-	@Override
-	protected String getQualifier()
-	{
-		return XSLDebugUIConstants.OUTPUT_BLOCK;
-	}
-
-	@Override
-	protected Table getTable()
-	{
-		return table;
-	}
-
-	public void createControl(Composite parent)
-	{
-		usePropertiesFromPreferencesRadio = new Button(parent, SWT.RADIO);
-		GridData gd = new GridData(SWT.LEFT, SWT.CENTER, false, false);
-		usePropertiesFromPreferencesRadio.setLayoutData(gd);
-		usePropertiesFromPreferencesRadio.setText(Messages.OutputPropertiesBlock_0);
-		usePropertiesFromPreferencesRadio.addSelectionListener(new SelectionListener()
-		{
-
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-
-			public void widgetSelected(SelectionEvent e)
-			{
-				handleUsePropertiesFromPreferences(true);
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		changePreferences = new Button(parent, SWT.PUSH);
-		changePreferences.setText(Messages.OutputPropertiesBlock_1);
-		gd = new GridData(SWT.RIGHT, SWT.CENTER, false, false);
-		changePreferences.setLayoutData(gd);
-		changePreferences.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				IPreferencePage page = new OutputPreferencePage();
-				XSLDebugUIPlugin.showPreferencePage("org.eclipse.wst.xsl.debug.ui.output", page); //$NON-NLS-1$
-				handleUsePropertiesFromPreferences(true);
-			}
-		});
-
-		useSpecificPropertiesRadio = new Button(parent, SWT.RADIO);
-		gd = new GridData(SWT.LEFT, SWT.CENTER, false, false);
-		useSpecificPropertiesRadio.setLayoutData(gd);
-		useSpecificPropertiesRadio.setText(Messages.OutputPropertiesBlock_3);
-		useSpecificPropertiesRadio.addSelectionListener(new SelectionListener()
-		{
-
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-
-			public void widgetSelected(SelectionEvent e)
-			{
-				handleUsePropertiesFromPreferences(false);
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		// filler
-		new Label(parent, SWT.NONE);
-
-		table = new Table(parent, SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.horizontalSpan = 2;
-		table.setLayoutData(gd);
-
-		setControl(table);
-
-		table.setLinesVisible(true);
-		table.setHeaderVisible(true);
-
-		TableColumn c1 = new TableColumn(table, SWT.NONE);
-		c1.setWidth(150);
-		c1.setResizable(true);
-		c1.setText(Messages.OutputPropertiesBlock_4);
-
-		TableColumn c2 = new TableColumn(table, SWT.NONE);
-		c2.setWidth(250);
-		c2.setResizable(true);
-		c2.setText(Messages.OutputPropertiesBlock_5);
-
-		tViewer = new TableViewer(table);
-		tViewer.setContentProvider(new IStructuredContentProvider()
-		{
-
-			public Object[] getElements(Object inputElement)
-			{
-				return launchProperties.getProperties().keySet().toArray(new String[0]);
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-
-			}
-		});
-		tViewer.setLabelProvider(new ITableLabelProvider()
-		{
-
-			public Image getColumnImage(Object element, int columnIndex)
-			{
-				return null;
-			}
-
-			public String getColumnText(Object element, int columnIndex)
-			{
-				String prop = (String) element;
-				switch (columnIndex)
-				{
-					case 0:
-						return prop;
-					case 1:
-						return launchProperties.getProperty(prop);
-				}
-				return "!!"; //$NON-NLS-1$
-			}
-
-			public void addListener(ILabelProviderListener listener)
-			{
-			}
-
-			public void dispose()
-			{
-			}
-
-			public boolean isLabelProperty(Object element, String property)
-			{
-				return false;
-			}
-
-			public void removeListener(ILabelProviderListener listener)
-			{
-			}
-
-		});
-		tViewer.setColumnProperties(new String[]
-		{ Messages.OutputPropertiesBlock_7, Messages.OutputPropertiesBlock_8 });
-		tViewer.setCellModifier(new ICellModifier()
-		{
-			public boolean canModify(Object element, String property)
-			{
-				if (!Messages.OutputPropertiesBlock_9.equals(property))
-					return false;
-				return true;
-			}
-
-			public Object getValue(Object element, String property)
-			{
-				String prop = (String) element;
-				String value = launchProperties.getProperty(prop);
-				return value == null ? "" : value; //$NON-NLS-1$
-			}
-
-			public void modify(Object element, String property, Object value)
-			{
-				Item item = (Item) element;
-				String prop = (String) item.getData();
-				if (value == null || "".equals(value)) //$NON-NLS-1$
-					launchProperties.removeProperty(prop);
-				else
-					launchProperties.setProperty(prop, (String) value);
-				tViewer.update(prop, null);
-				updateLaunchConfigurationDialog();
-			}
-		});
-		tViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2)
-			{
-				String prop1 = (String) e1;
-				String prop2 = (String) e2;
-				return prop1.compareTo(prop2);
-			}
-		});
-		tViewer.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				String prop = (String) selection.getFirstElement();
-				String text = null;
-				if (prop != null)
-				{
-					IProcessorType[] types = XSLTRuntime.getProcessorTypes();
-					outer: for (int i = 0; i < types.length; i++)
-					{
-						IProcessorType processorType = types[i];
-						IOutputProperty[] property = processorType.getOutputProperties();
-						for (int j = 0; j < property.length; j++)
-						{
-							IOutputProperty outputProperty = property[j];
-							if (outputProperty.getURI().equals(prop))
-							{
-								text = outputProperty.getDescription();
-								break outer;
-							}
-						}
-					}
-				}
-				descriptionText.setText(text == null ? "" : text); //$NON-NLS-1$
-			}
-		});
-
-		TextCellEditor editor = new TextCellEditor(table);
-
-		CellEditor[] editors = new CellEditor[]
-		{ null, editor };
-		tViewer.setCellEditors(editors);
-
-		descriptionText = new Text(parent, SWT.BORDER | SWT.READ_ONLY | SWT.V_SCROLL | SWT.WRAP);
-		gd = new GridData(SWT.FILL, SWT.NONE, true, false);
-		gd.horizontalSpan = 3;
-		gd.heightHint = 50;
-		descriptionText.setLayoutData(gd);
-
-		// must come after input has been set
-		restoreColumnSettings();
-	}
-
-	private void handleUsePropertiesFromPreferences(boolean selected)
-	{
-		changePreferences.setEnabled(selected);
-		table.setEnabled(!selected);
-
-		if (selected)
-		{
-			launchProperties = initializeFeaturesFromPreferences();
-		}
-		else
-		{
-			launchProperties = (LaunchProperties) typeProperties.get(processorType);
-
-			if (launchProperties == null)
-			{// make a copy of the features for the processor type
-				launchProperties = new LaunchProperties();
-				typeProperties.put(processorType, launchProperties);
-				for (int i = 0; i < processorType.getOutputProperties().length; i++)
-				{
-					IOutputProperty property = processorType.getOutputProperties()[i];
-					launchProperties.setProperty(property.getURI(), null);
-				}
-			}
-		}
-		tViewer.setInput(launchProperties);
-	}
-
-	public String getName()
-	{
-		return Messages.OutputPropertiesBlock_13;
-	}
-
-	private LaunchProperties initializeFeaturesFromPreferences()
-	{
-		LaunchProperties preferences = new LaunchProperties();
-
-		IProcessorType jreDefaultType = XSLTRuntime.getProcessorType(XSLTRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID);
-		IOutputProperty[] features = jreDefaultType.getOutputProperties();
-		Map<?, ?> values = jreDefaultType.getOutputPropertyValues();
-		for (IOutputProperty feature : features)
-		{
-			String key = feature.getURI();
-			preferences.setProperty(key, (String) values.get(key));
-		}
-
-		features = processorType.getOutputProperties();
-		values = processorType.getOutputPropertyValues();
-		for (IOutputProperty feature : features)
-		{
-			String key = feature.getURI();
-			preferences.setProperty(key, (String) values.get(key));
-		}
-
-		return preferences;
-	}
-
-	private void initializeFeaturesFromStorage(ILaunchConfiguration configuration) throws CoreException
-	{
-		LaunchProperties launchFeatures = new LaunchProperties();
-
-		IProcessorType jreDefaultType = XSLTRuntime.getProcessorType(XSLTRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID);
-		IOutputProperty[] defaultProps = jreDefaultType.getOutputProperties();
-		for (IOutputProperty feature : defaultProps)
-		{
-			String key = feature.getURI();
-			launchFeatures.setProperty(key, null);
-		}
-		IOutputProperty[] specificProps = processorType.getOutputProperties();
-		for (IOutputProperty feature : specificProps)
-		{
-			String key = feature.getURI();
-			launchFeatures.setProperty(key, null);
-		}
-
-		String s = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_PROPERTIES, (String) null);
-		if (s != null && s.length() > 0)
-		{
-			LaunchProperties overrideFeatures = LaunchProperties.fromXML(new ByteArrayInputStream(s.getBytes()));
-			IOutputProperty[] props = new IOutputProperty[specificProps.length + defaultProps.length];
-			System.arraycopy(specificProps, 0, props, 0, specificProps.length);
-			System.arraycopy(defaultProps, 0, props, specificProps.length, defaultProps.length);
-			for (Iterator<?> iterator = overrideFeatures.getProperties().keySet().iterator(); iterator.hasNext();)
-			{
-				String key = (String) iterator.next();
-				launchFeatures.removeProperty(key);
-				for (IOutputProperty prop : props)
-				{
-					if (prop.getURI().equals(key))
-					{
-						launchFeatures.setProperty(key, overrideFeatures.getProperty(key));
-						break;
-					}
-				}
-			}
-		}
-
-		typeProperties.put(processorType, launchFeatures);
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		try
-		{
-			String processorId = null;
-			boolean useDefaultProcessor = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, true);
-			if (useDefaultProcessor)
-				processorId = XSLTRuntime.getDefaultProcessor().getId();
-			else
-				processorId = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PROCESSOR, XSLTRuntime.JRE_DEFAULT_PROCESSOR_ID);
-
-			IProcessorInstall processor = XSLTRuntime.getProcessor(processorId);
-			if (processor != null)
-				processorType = processor.getProcessorType();
-			else
-				processorType = XSLTRuntime.getDefaultProcessor().getProcessorType();
-
-			initializeFeaturesFromStorage(configuration);
-
-			boolean useFeaturesFromPreferences = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_PROPERTIES_FROM_PREFERENCES, true);
-
-			useSpecificPropertiesRadio.setSelection(!useFeaturesFromPreferences);
-			usePropertiesFromPreferencesRadio.setSelection(useFeaturesFromPreferences);
-			handleUsePropertiesFromPreferences(useFeaturesFromPreferences);
-		}
-		catch (CoreException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_PROPERTIES_FROM_PREFERENCES, usePropertiesFromPreferencesRadio.getSelection());
-		String xml;
-		try
-		{
-			xml = launchProperties.toXML();
-			configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_PROPERTIES, xml);
-		}
-		catch (Exception e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_PROPERTIES_FROM_PREFERENCES, true);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/OutputTab.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/OutputTab.java
deleted file mode 100644
index 1cca556..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/OutputTab.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.output;
-
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-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.Group;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLLaunchConfigurationTab;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.XSLMainTab;
-
-public class OutputTab extends XSLLaunchConfigurationTab
-{
-	private final OutputPropertiesBlock outputBlock;
-	private final OutputFileBlock outputFileBlock;
-
-	public OutputTab(XSLMainTab main)
-	{
-		outputFileBlock = new OutputFileBlock();
-		outputBlock = new OutputPropertiesBlock(main);
-
-		setBlocks(new ILaunchConfigurationTab[]
-		{ outputBlock, outputFileBlock });
-	}
-
-	@Override
-	public void createControl(Composite parent)
-	{
-		super.createControl(parent);
-		Composite comp = (Composite) getControl();
-		GridLayout layout = new GridLayout(1, false);
-		comp.setLayout(layout);
-
-		outputFileBlock.createControl(comp);
-
-		Group group = new Group(comp, SWT.NULL);
-		group.setText(Messages.OutputTab_0);
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		group.setLayoutData(gd);
-		layout = new GridLayout(2, false);
-		group.setLayout(layout);
-
-		outputBlock.createControl(group);
-	}
-
-	public String getName()
-	{
-		return Messages.OutputTab_1;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/messages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/messages.properties
deleted file mode 100644
index 851fbb3..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-OutputPropertiesBlock_0=Use properties from preferences
-OutputPropertiesBlock_1=Change Preferences...
-OutputPropertiesBlock_13=Output Properties
-OutputPropertiesBlock_3=Use specific properties
-OutputPropertiesBlock_4=Property
-OutputPropertiesBlock_5=Value
-OutputPropertiesBlock_7=property
-OutputPropertiesBlock_8=value
-OutputPropertiesBlock_9=value
-OutputTab_0=Output Properties
-OutputTab_1=Output
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/FeaturesBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/FeaturesBlock.java
deleted file mode 100644
index be98df2..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/FeaturesBlock.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.processor;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.preference.IPreferencePage;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-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.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-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.Font;
-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.Group;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xsl.internal.debug.ui.AbstractTableBlock;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIConstants;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.preferences.FeaturesPreferencePage;
-import org.eclipse.wst.xsl.launching.IFeature;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
-import org.eclipse.wst.xsl.launching.config.LaunchFeatures;
-
-public class FeaturesBlock extends AbstractTableBlock
-{
-	private Table table;
-	private TableViewer tViewer;
-	private Text descriptionText;
-	private IProcessorType processorType;
-	private Button useFeaturesFromPreferencesRadio;
-	private LaunchFeatures launchFeatures;
-	private LaunchFeatures featuresFromPreferences;
-	private Button changePreferences;
-	private final Map<IProcessorType, LaunchFeatures> processorFeatures = new HashMap<IProcessorType, LaunchFeatures>();
-	private Button useSpecificFeaturesRadio;
-
-	@Override
-	protected IDialogSettings getDialogSettings()
-	{
-		return XSLDebugUIPlugin.getDefault().getDialogSettings();
-	}
-
-	@Override
-	protected String getQualifier()
-	{
-		return XSLDebugUIConstants.FEATURES_LAUNCH_BLOCK;
-	}
-
-	@Override
-	protected Table getTable()
-	{
-		return table;
-	}
-
-	public void createControl(Composite parent)
-	{
-		Font font = parent.getFont();
-
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(getName());
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		group.setLayoutData(gd);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		group.setLayout(layout);
-		group.setFont(font);
-
-		setControl(group);
-
-		useFeaturesFromPreferencesRadio = new Button(group, SWT.RADIO);
-		gd = new GridData(SWT.LEFT, SWT.CENTER, false, false);
-		useFeaturesFromPreferencesRadio.setLayoutData(gd);
-		useFeaturesFromPreferencesRadio.setText(Messages.getString("FeaturesBlock.0")); //$NON-NLS-1$
-		useFeaturesFromPreferencesRadio.addSelectionListener(new SelectionListener()
-		{
-
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-
-			public void widgetSelected(SelectionEvent e)
-			{
-				handleUseFeaturesFromPreferences(true);
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		changePreferences = new Button(group, SWT.PUSH);
-		changePreferences.setText(Messages.getString("FeaturesBlock.1")); //$NON-NLS-1$
-		gd = new GridData(SWT.RIGHT, SWT.CENTER, false, false);
-		changePreferences.setLayoutData(gd);
-		changePreferences.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				IPreferencePage page = new FeaturesPreferencePage();
-				XSLDebugUIPlugin.showPreferencePage("org.eclipse.wst.xsl.debug.ui.page1", page); //$NON-NLS-1$
-				// now refresh everything
-				handleUseFeaturesFromPreferences(true);
-				// tViewer.refresh();
-			}
-		});
-
-		useSpecificFeaturesRadio = new Button(group, SWT.RADIO);
-		gd = new GridData(SWT.LEFT, SWT.CENTER, false, false);
-		useSpecificFeaturesRadio.setLayoutData(gd);
-		useSpecificFeaturesRadio.setText(Messages.getString("FeaturesBlock.3")); //$NON-NLS-1$
-		useSpecificFeaturesRadio.addSelectionListener(new SelectionListener()
-		{
-
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-
-			public void widgetSelected(SelectionEvent e)
-			{
-				handleUseFeaturesFromPreferences(false);
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		// filler
-		new Label(group, SWT.NONE);
-
-		table = new Table(group, SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gd.widthHint = 450;
-		gd.horizontalSpan = 2;
-		table.setLayoutData(gd);
-		table.setLinesVisible(true);
-		table.setHeaderVisible(true);
-
-		TableColumn c1 = new TableColumn(table, SWT.NONE);
-		c1.setWidth(150);
-		c1.setResizable(true);
-		c1.setText(Messages.getString("FeaturesBlock.4")); //$NON-NLS-1$
-
-		TableColumn c2 = new TableColumn(table, SWT.NONE);
-		c2.setWidth(50);
-		c2.setResizable(true);
-		c2.setText(Messages.getString("FeaturesBlock.5")); //$NON-NLS-1$
-
-		TableColumn c3 = new TableColumn(table, SWT.NONE);
-		c3.setWidth(250);
-		c3.setResizable(true);
-		c3.setText(Messages.getString("FeaturesBlock.6")); //$NON-NLS-1$
-
-		tViewer = new TableViewer(table);
-		tViewer.setContentProvider(new IStructuredContentProvider()
-		{
-
-			private Set<?> typedFeatures;
-
-			public Object[] getElements(Object inputElement)
-			{
-				return typedFeatures.toArray(new LaunchAttribute[0]);
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-				typedFeatures = (Set<?>) newInput;
-			}
-		});
-		tViewer.setLabelProvider(new ITableLabelProvider()
-		{
-
-			public Image getColumnImage(Object element, int columnIndex)
-			{
-				return null;
-			}
-
-			public String getColumnText(Object element, int columnIndex)
-			{
-				LaunchAttribute tv = (LaunchAttribute) element;
-				switch (columnIndex)
-				{
-					case 0:
-						return removeURI(tv.uri);
-					case 1:
-						return tv.type;
-					case 2:
-						String value = tv.value;
-						return value == null ? "" : value; //$NON-NLS-1$
-				}
-				return "!!"; //$NON-NLS-1$
-			}
-
-			private String removeURI(String uri)
-			{
-				int index = uri.lastIndexOf('/');
-				if (index > 0)
-					return uri.substring(index + 1);
-				return uri;
-			}
-
-			public void addListener(ILabelProviderListener listener)
-			{
-			}
-
-			public void dispose()
-			{
-			}
-
-			public boolean isLabelProperty(Object element, String property)
-			{
-				return false;
-			}
-
-			public void removeListener(ILabelProviderListener listener)
-			{
-			}
-
-		});
-		tViewer.setColumnProperties(new String[]
-		{ Messages.getString("FeaturesBlock.9"), Messages.getString("FeaturesBlock.10"), Messages.getString("FeaturesBlock.11") }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		tViewer.setCellModifier(new ICellModifier()
-		{
-			public boolean canModify(Object element, String property)
-			{
-				return Messages.getString("FeaturesBlock.12").equals(property); //$NON-NLS-1$
-			}
-
-			public Object getValue(Object element, String property)
-			{
-				LaunchAttribute tv = (LaunchAttribute) element;
-				return tv.value == null ? "" : tv.value; //$NON-NLS-1$
-			}
-
-			public void modify(Object element, String property, Object value)
-			{
-				Item item = (Item) element;
-				LaunchAttribute tv = (LaunchAttribute) item.getData();
-				if (value == null || "".equals(value)) //$NON-NLS-1$
-					launchFeatures.removeFeature(tv.uri);
-				else
-					tv.setValue((String) value);
-				tViewer.update(tv, null);
-				updateLaunchConfigurationDialog();
-			}
-		});
-		tViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2)
-			{
-				LaunchAttribute a1 = (LaunchAttribute) e1;
-				LaunchAttribute a2 = (LaunchAttribute) e2;
-				return a1.uri.compareTo(a2.uri);
-			}
-		});
-
-		TextCellEditor editor = new TextCellEditor(table);
-		editor.setValidator(new ICellEditorValidator()
-		{
-
-			// TODO sort out
-			public String isValid(Object value)
-			{
-				return null;
-				// IStructuredSelection sel =
-				// (IStructuredSelection)tViewer.getSelection();
-				// TypedValue tv = (TypedValue)sel.getFirstElement();
-				//			
-				// IFeature feature = null;
-				// IFeature[] features = processorType.getFeatures();
-				// for (int i = 0; i < features.length; i++)
-				// {
-				// IFeature f = features[i];
-				// if (f.getURI().equals(key))
-				// {
-				// feature = f;
-				// break;
-				// }
-				// }
-				// String valid = null;
-				// IStatus validStatus = feature.validateValue((String)value);
-				// if (validStatus != null && validStatus.getSeverity() ==
-				// IStatus.ERROR)
-				// {
-				// valid = validStatus.getMessage();
-				// }
-				// return valid;
-			}
-		});
-
-		CellEditor[] editors = new CellEditor[]
-		{ null, null, editor };
-		tViewer.setCellEditors(editors);
-		tViewer.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				LaunchAttribute tv = (LaunchAttribute) selection.getFirstElement();
-				String text = null;
-				if (tv != null)
-				{
-					IFeature feature = null;
-					IFeature[] features = processorType.getFeatures();
-					for (IFeature f : features)
-					{
-						if (f.getURI().equals(tv.uri))
-						{
-							feature = f;
-							break;
-						}
-					}
-					text = feature == null ? null : feature.getDescription();
-				}
-				descriptionText.setText(text == null ? "" : text); //$NON-NLS-1$
-			}
-		});
-
-		descriptionText = new Text(group, SWT.BORDER | SWT.READ_ONLY | SWT.V_SCROLL | SWT.WRAP);
-		gd = new GridData(SWT.FILL, SWT.NONE, true, false);
-		gd.horizontalSpan = 3;
-		gd.heightHint = 50;
-		descriptionText.setLayoutData(gd);
-
-		restoreColumnSettings();
-	}
-
-	private void handleUseFeaturesFromPreferences(boolean selected)
-	{
-		changePreferences.setEnabled(selected);
-		table.setEnabled(!selected);
-
-		if (selected)
-		{
-			launchFeatures = initializeFeaturesFromPreferences();
-		}
-		else
-		{
-			launchFeatures = (LaunchFeatures) processorFeatures.get(processorType);
-
-			if (launchFeatures == null)
-			{// make a copy of the features for the processor type
-				launchFeatures = new LaunchFeatures();
-				processorFeatures.put(processorType, launchFeatures);
-				for (int i = 0; i < processorType.getFeatures().length; i++)
-				{
-					IFeature feature = processorType.getFeatures()[i];
-					LaunchAttribute att = new LaunchAttribute(feature.getURI(), feature.getType(), null);
-					launchFeatures.addFeature(att);
-				}
-			}
-		}
-		tViewer.setInput(launchFeatures.getFeatures());
-	}
-
-	protected void setProcessorType(IProcessorType processorType)
-	{
-		if (processorType == this.processorType)
-			return;
-
-		// this.featuresFromPreferences = new LaunchFeatures();
-		// IFeature[] features = processorType.getFeatures();
-		// Map values = processorType.getFeatureValues();
-		// for (int i = 0; i < features.length; i++)
-		// {
-		// IFeature feature = features[i];
-		// featuresFromPreferences.addFeature(new
-		// LaunchAttribute(feature.getURI(),feature.getType(),(String)values.get(feature.getURI())));
-		// }
-		//
-		// if (table != null)
-		// {
-		// if (!table.getEnabled())
-		// {
-		// launchFeatures = featuresFromPreferences;
-		// }
-		// else
-		// {
-		// this.launchFeatures = new LaunchFeatures();
-		// for (Iterator iter =
-		// featuresFromPreferences.getFeatures().iterator(); iter.hasNext();)
-		// {
-		// LaunchAttribute att = (LaunchAttribute) iter.next();
-		// att = new LaunchAttribute(att.uri,att.type,att.value);
-		// launchFeatures.addFeature(att);
-		// }
-		// }
-		// tViewer.setInput(launchFeatures.getFeatures());
-		// }
-		this.processorType = processorType;
-		handleUseFeaturesFromPreferences(useFeaturesFromPreferencesRadio.getSelection());
-	}
-
-	public String getName()
-	{
-		return Messages.getString("FeaturesBlock.16"); //$NON-NLS-1$
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_FEATURES_FROM_PREFERENCES, true);
-	}
-
-	private LaunchFeatures initializeFeaturesFromPreferences()
-	{
-		LaunchFeatures featuresFromPreferences = new LaunchFeatures();
-
-		IFeature[] features = processorType.getFeatures();
-		Map<?, ?> values = processorType.getFeatureValues();
-		for (IFeature feature : features)
-		{
-			featuresFromPreferences.addFeature(new LaunchAttribute(feature.getURI(), feature.getType(), (String) values.get(feature.getURI())));
-		}
-		return featuresFromPreferences;
-	}
-
-	private void initializeFeaturesFromStorage(ILaunchConfiguration configuration) throws CoreException
-	{
-		LaunchFeatures launchFeatures = new LaunchFeatures();
-
-		IFeature[] features = processorType.getFeatures();
-		for (IFeature feature : features)
-		{
-			launchFeatures.addFeature(new LaunchAttribute(feature.getURI(), feature.getType(), null));
-		}
-
-		String s = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_FEATURES, (String) null);
-		if (s != null && s.length() > 0)
-		{
-			LaunchFeatures overrideFeatures = LaunchFeatures.fromXML(new ByteArrayInputStream(s.getBytes()));
-			launchFeatures.getFeatures().removeAll(overrideFeatures.getFeatures());
-			launchFeatures.getFeatures().addAll(overrideFeatures.getFeatures());
-		}
-
-		processorFeatures.put(processorType, launchFeatures);
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		try
-		{
-			String processorId = null;
-			boolean useDefaultProcessor = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, true);
-			if (useDefaultProcessor)
-				processorId = XSLTRuntime.getDefaultProcessor().getId();
-			else
-				processorId = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PROCESSOR, XSLTRuntime.JRE_DEFAULT_PROCESSOR_ID);
-
-			IProcessorInstall processor = XSLTRuntime.getProcessor(processorId);
-			if (processor != null)
-				processorType = processor.getProcessorType();
-			else
-				processorType = XSLTRuntime.getDefaultProcessor().getProcessorType();
-
-			featuresFromPreferences = initializeFeaturesFromPreferences();
-			initializeFeaturesFromStorage(configuration);
-
-			boolean useFeaturesFromPreferences = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_FEATURES_FROM_PREFERENCES, true);
-
-			useSpecificFeaturesRadio.setSelection(!useFeaturesFromPreferences);
-			useFeaturesFromPreferencesRadio.setSelection(useFeaturesFromPreferences);
-			handleUseFeaturesFromPreferences(useFeaturesFromPreferences);
-		}
-		catch (CoreException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		boolean useDefault = useFeaturesFromPreferencesRadio.getSelection();
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_FEATURES_FROM_PREFERENCES, useDefault);
-		try
-		{
-			configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_FEATURES, useDefault ? null : launchFeatures.toXML());
-		}
-		catch (ParserConfigurationException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		catch (IOException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		catch (TransformerException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/InstallStandin.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/InstallStandin.java
deleted file mode 100644
index 5e78ade..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/InstallStandin.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.processor;
-
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.IProcessorJar;
-import org.eclipse.wst.xsl.launching.ProcessorInstall;
-
-public class InstallStandin extends ProcessorInstall
-{
-	public InstallStandin(IProcessorInstall install)
-	{
-		super(install.getId(), install.getName(), install.getProcessorType().getId(), install.getProcessorJars(), install.getDebugger() != null ? install.getDebugger().getId() : null, install
-				.getSupports(), install.isContributed());
-	}
-
-	public InstallStandin(String id, String name, String typeId, String debuggerId, IProcessorJar[] jars)
-	{
-		super(id, name, typeId, jars, debuggerId, "", false); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/JarContentProvider.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/JarContentProvider.java
deleted file mode 100644
index bca1de9..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/JarContentProvider.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.processor;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-
-public class JarContentProvider implements IStructuredContentProvider
-{
-	private IProcessorInstall install;
-
-	public Object[] getElements(Object inputElement)
-	{
-		return install.getProcessorJars();
-	}
-
-	public void dispose()
-	{
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-	{
-		install = (IProcessorInstall) newInput;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/JarLabelProvider.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/JarLabelProvider.java
deleted file mode 100644
index 7685d12..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/JarLabelProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.processor;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.wst.xsl.launching.IProcessorJar;
-
-public class JarLabelProvider extends LabelProvider
-{
-	@Override
-	public String getText(Object element)
-	{
-		IProcessorJar jar = (IProcessorJar) element;
-		IPath path = jar.getPath();
-		return path.lastSegment() + " - " + path.removeLastSegments(1).toOSString() + ""; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/Messages.java
deleted file mode 100644
index 1590113..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.processor;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.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/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorBlock.java
deleted file mode 100644
index ef8730e..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorBlock.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.processor;
-
-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.preference.IPreferencePage;
-import org.eclipse.jface.viewers.ComboViewer;
-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.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-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.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.preferences.ProcessorsPreferencePage;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class ProcessorBlock extends AbstractLaunchConfigurationTab
-{
-	private Button usePreferencesRadio;
-	private Button alterPreferencesButton;
-	private Button overridePreferencesRadio;
-	private Combo runCombo;
-	private Button installedProcessorsButton;
-	private ComboViewer runComboViewer;
-	private final FeaturesBlock featuresBlock;
-
-	public ProcessorBlock(FeaturesBlock featuresBlock)
-	{
-		this.featuresBlock = featuresBlock;
-	}
-
-	public void createControl(Composite parent)
-	{
-		Font font = parent.getFont();
-
-		Group group = new Group(parent, SWT.NULL);
-		setControl(group);
-		group.setLayout(new GridLayout(2, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		group.setFont(font);
-		group.setText(ProcessorMessages.ProcessorBlock_0);
-
-		usePreferencesRadio = new Button(group, SWT.RADIO);
-		usePreferencesRadio.setText(ProcessorMessages.ProcessorBlock_1);
-		usePreferencesRadio.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				preferencesSelected();
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		alterPreferencesButton = new Button(group, SWT.PUSH);
-		alterPreferencesButton.setText(ProcessorMessages.ProcessorBlock_2);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		gd.widthHint = 150;
-		alterPreferencesButton.setLayoutData(gd);
-		alterPreferencesButton.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				IPreferencePage page = new ProcessorsPreferencePage();
-				showPrefPage("org.eclipse.wst.xslt.launching.ui.preferences.ProcessorPreferencePage", page); //$NON-NLS-1$
-			}
-		});
-
-		overridePreferencesRadio = new Button(group, SWT.RADIO);
-		overridePreferencesRadio.setText(ProcessorMessages.ProcessorBlock_4);
-		overridePreferencesRadio.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				overrideSelected();
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		installedProcessorsButton = new Button(group, SWT.PUSH);
-		installedProcessorsButton.setText(ProcessorMessages.ProcessorsComboBlock_1);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_END);
-		gd.widthHint = 150;
-		installedProcessorsButton.setLayoutData(gd);
-		installedProcessorsButton.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				IPreferencePage page = new ProcessorsPreferencePage();
-				showPrefPage("org.eclipse.wst.xslt.launching.ui.preferences.ProcessorPreferencePage", page); //$NON-NLS-1$
-			}
-		});
-
-		Composite settingsComp = new Composite(group, SWT.NONE);
-		GridLayout gl = new GridLayout(2, false);
-		gl.marginHeight = 2;
-		settingsComp.setLayout(gl);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalIndent = 15;
-		gd.horizontalSpan = 2;
-		settingsComp.setLayoutData(gd);
-		settingsComp.setFont(font);
-
-		Label label = new Label(settingsComp, SWT.NONE);
-		label.setText(ProcessorMessages.ProcessorBlock_6);
-		runCombo = new Combo(settingsComp, SWT.READ_ONLY | SWT.SINGLE);
-		runCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		runComboViewer = new ComboViewer(runCombo);
-		runComboViewer.setContentProvider(new ComboContentProvider());
-		runComboViewer.setLabelProvider(new ComboLabelProvider());
-		runComboViewer.setInput(XSLTRuntime.getProcessors());
-		runComboViewer.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IStructuredSelection sel = (IStructuredSelection) event.getSelection();
-				if (!sel.isEmpty())
-				{
-					IProcessorInstall processor = (IProcessorInstall) sel.getFirstElement();
-					featuresBlock.setProcessorType(processor.getProcessorType());
-				}
-				updateLaunchConfigurationDialog();
-			}
-		});
-	}
-
-	private void preferencesSelected()
-	{
-		alterPreferencesButton.setEnabled(true);
-		installedProcessorsButton.setEnabled(false);
-		runCombo.setEnabled(false);
-		runComboViewer.setSelection(new StructuredSelection(getRunProcessorPreference()), true);
-	}
-
-	private void overrideSelected()
-	{
-		alterPreferencesButton.setEnabled(false);
-		installedProcessorsButton.setEnabled(true);
-		runCombo.setEnabled(true);
-	}
-
-	private void showPrefPage(String id, IPreferencePage page)
-	{
-		XSLDebugUIPlugin.showPreferencePage(id, page);
-		// now refresh everything
-		runComboViewer.setInput(XSLTRuntime.getProcessors());
-		runComboViewer.setSelection(new StructuredSelection(getRunProcessorPreference()), true);
-		// preferencesSelected();
-	}
-
-	public String getName()
-	{
-		return ProcessorMessages.ProcessorBlock_7;
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		try
-		{
-			boolean useDefaultProcessor = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, true);
-			if (useDefaultProcessor)
-			{
-				usePreferencesRadio.setSelection(true);
-				overridePreferencesRadio.setSelection(false);
-				preferencesSelected();
-			}
-			else
-			{
-				usePreferencesRadio.setSelection(false);
-				overridePreferencesRadio.setSelection(true);
-				overrideSelected();
-
-				IProcessorInstall runInstall = null;
-				String runId = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PROCESSOR, (String) null);
-				if (runId != null)
-					runInstall = XSLTRuntime.getProcessor(runId);
-				if (runInstall == null)
-					runInstall = getRunProcessorPreference();
-				runComboViewer.setSelection(new StructuredSelection(runInstall));
-
-				// IDebugger debugInstall = null;
-				// String debugId =
-				// configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PROCESSOR_FOR_DEBUG,
-				// (String)null);
-				// if (debugId != null)
-				// debugInstall = XSLTRuntime.getDebugger(debugId);
-				// if (debugInstall == null)
-				// debugInstall = runInstall.getDebugger();
-				// if (debugInstall == null)
-				// debugInstall = getDebugProcessorPreference();
-				// debugComboViewer.setSelection(new
-				// StructuredSelection(debugInstall));
-			}
-		}
-		catch (CoreException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	private IProcessorInstall getRunProcessorPreference()
-	{
-		return XSLTRuntime.getDefaultProcessor();
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		boolean usePreferences = usePreferencesRadio.getSelection();
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, usePreferences);
-		if (!usePreferences)
-		{
-			IProcessorInstall runprocessor = (IProcessorInstall) ((IStructuredSelection) runComboViewer.getSelection()).getFirstElement();
-			configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_PROCESSOR, runprocessor.getId());
-		}
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, true);
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_PROCESSOR, (String) null);
-	}
-
-	private class ComboContentProvider implements IStructuredContentProvider
-	{
-		public Object[] getElements(Object inputElement)
-		{
-			return XSLTRuntime.getProcessors();
-		}
-
-		public void dispose()
-		{
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-		{
-		}
-	}
-
-	private class ComboLabelProvider extends LabelProvider
-	{
-		@Override
-		public String getText(Object element)
-		{
-			IProcessorInstall install = (IProcessorInstall) element;
-			return install.getName();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorDescriptor.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorDescriptor.java
deleted file mode 100644
index d8d83f4..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorDescriptor.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.processor;
-
-public abstract class ProcessorDescriptor
-{
-	public abstract String getDescription();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorDetailsDialog.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorDetailsDialog.java
deleted file mode 100644
index dba9e2b..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorDetailsDialog.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.processor;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-
-public class ProcessorDetailsDialog extends Dialog
-{
-	private final IProcessorInstall install;
-
-	public ProcessorDetailsDialog(Shell shell, IProcessorInstall install)
-	{
-		super(shell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.install = install;
-	}
-
-	@Override
-	protected void configureShell(Shell newShell)
-	{
-		super.configureShell(newShell);
-		newShell.setText(ProcessorMessages.ProcessorDetailsDialog_Title);
-		// TODO PlatformUI.getWorkbench().getHelpSystem().setHelp...
-	}
-
-	@Override
-	protected Control createDialogArea(Composite ancestor)
-	{
-		Composite parent = (Composite) super.createDialogArea(ancestor);
-		GridLayout layout = new GridLayout(2, false);
-		parent.setLayout(layout);
-
-		// type
-		createLabel(parent, ProcessorMessages.ProcessorDetailsDialog_installType);
-		createLabel(parent, install.getProcessorType().getLabel());
-
-		// name
-		createLabel(parent, ProcessorMessages.ProcessorDetailsDialog_installName);
-		createLabel(parent, install.getName());
-
-		// jars
-		Label label = createLabel(parent, ProcessorMessages.ProcessorDetailsDialog_installClasspath);
-		GridData gd = new GridData(GridData.VERTICAL_ALIGN_BEGINNING | GridData.HORIZONTAL_ALIGN_BEGINNING);
-		label.setLayoutData(gd);
-		TableViewer libraryViewer = new TableViewer(parent);
-		gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 6;
-		libraryViewer.getControl().setLayoutData(gd);
-		libraryViewer.setContentProvider(new JarContentProvider());
-		libraryViewer.setLabelProvider(new JarLabelProvider());
-		libraryViewer.setInput(install);
-
-		applyDialogFont(parent);
-		return parent;
-	}
-
-	private Label createLabel(Composite parent, String text)
-	{
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(text);
-		return label;
-	}
-
-	/**
-	 * Returns the name of the section that this dialog stores its settings in
-	 * 
-	 * @return String
-	 */
-	protected String getDialogSettingsSectionName()
-	{
-		return "XSL_DETAILS_DIALOG_SECTION"; //$NON-NLS-1$
-	}
-
-	@Override
-	protected IDialogSettings getDialogBoundsSettings()
-	{
-		IDialogSettings settings = XSLDebugUIPlugin.getDefault().getDialogSettings();
-		IDialogSettings section = settings.getSection(getDialogSettingsSectionName());
-		if (section == null)
-		{
-			section = settings.addNewSection(getDialogSettingsSectionName());
-		}
-		return section;
-	}
-
-	@Override
-	protected void createButtonsForButtonBar(Composite parent)
-	{
-		// create OK and Cancel buttons by default
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorMessages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorMessages.java
deleted file mode 100644
index 98450fa..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorMessages.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.processor;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class ProcessorMessages extends NLS
-{
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.ProcessorMessages"; //$NON-NLS-1$
-
-	public static String ProcessorBlock_0;
-
-	public static String ProcessorBlock_1;
-
-	public static String ProcessorBlock_2;
-
-	public static String ProcessorBlock_4;
-
-	public static String ProcessorBlock_6;
-
-	public static String ProcessorBlock_7;
-
-	public static String ProcessorsComboBlock;
-	public static String ProcessorsComboBlock_0;
-	public static String ProcessorsComboBlock_1;
-	public static String SpecificProcessor;
-
-	public static String InputFileBlock_WORKSPACE_DIALOG_TITLE;
-
-	public static String InstalledProcessorsBlock_0;
-
-	public static String InstalledProcessorsBlock_1;
-
-	public static String InstalledProcessorsBlock_2;
-
-	public static String InstalledProcessorsBlock_3;
-
-	public static String InstalledProcessorsBlock_4;
-
-	public static String InstalledProcessorsBlock_5;
-
-	public static String InstalledProcessorsBlock_6;
-
-	public static String InstalledProcessorsBlock_7;
-
-	public static String InstalledProcessorsBlock_8;
-
-	public static String ProcessorDetailsDialog_Title;
-
-	public static String ProcessorDetailsDialog_installName;
-
-	public static String ProcessorDetailsDialog_installType;
-
-	public static String ProcessorDetailsDialog_installClasspath;
-
-	public static String AddProcessorDialog_1;
-
-	public static String AddProcessorDialog_7;
-
-	public static String AddProcessorDialog_Edit_Title;
-
-	public static String AddProcessorDialog_Add_Title;
-
-	public static String AddProcessorDialog_jars;
-
-	public static String AddProcessorDialog_features;
-
-	public static String AddProcessorDialog_processorName;
-
-	public static String AddProcessorDialog_processorType;
-
-	public static String ProcessorLibraryBlock_6;
-
-	public static String ProcessorLibraryBlock_AddButton;
-
-	public static String ProcessorLibraryBlock_RemoveButton;
-
-	public static String ProcessorLibraryBlock_AddWorkspaceButton;
-
-	public static String AddProcessorDialog_enterName;
-
-	public static String AddProcessorDialog_duplicateName;
-
-	public static String AddProcessorDialog_Processor_name_must_be_a_valid_file_name;
-
-	public static String ProcessorLibraryBlock_FileDialog_Title;
-
-	public static String ProcessorLibraryBlock_WorkspaceFileDialog_Title;
-
-	public static String ProcessorLibraryBlock_WorkspaceFileDialog_Message;
-
-	public static String ProcessorsUpdater;
-
-	public static String WorkingDirectoryBlock_1;
-
-	public static String WorkingDirectoryBlock_2;
-
-	public static String WorkingDirectoryBlock_3;
-
-	public static String WorkingDirectoryBlock_DIRECTORY_NOT_SPECIFIED;
-	public static String WorkingDirectoryBlock_DIRECTORY_DOES_NOT_EXIST;
-	public static String WorkingDirectoryBlock_DEFAULT_RADIO;
-	public static String WorkingDirectoryBlock_OTHER_RADIO;
-	public static String WorkingDirectoryBlock_DIALOG_MESSAGE;
-	public static String WorkingDirectoryBlock_WORKSPACE_DIALOG_MESSAGE;
-	public static String WorkingDirectoryBlock_VARIABLES_BUTTON;
-	public static String WorkingDirectoryBlock_FILE_SYSTEM_BUTTON;
-	public static String WorkingDirectoryBlock_WORKSPACE_BUTTON;
-	public static String WorkingDirectoryBlock_WORKSPACE_DIALOG_TITLE;
-
-	public static String URIResolverBlock_3;
-
-	public static String URIResolverBlock_5;
-
-	public static String URIResolverBlock_6;
-
-	public static String URIResolverBlock_8;
-
-	public static String URIResolverBlock_DIRECTORY_NOT_SPECIFIED;
-	public static String URIResolverBlock_DIRECTORY_DOES_NOT_EXIST;
-	public static String URIResolverBlock_DEFAULT_RADIO;
-	public static String URIResolverBlock_OTHER_RADIO;
-	public static String URIResolverBlock_DIALOG_MESSAGE;
-	public static String URIResolverBlock_WORKSPACE_DIALOG_MESSAGE;
-	public static String URIResolverBlock_VARIABLES_BUTTON;
-	public static String URIResolverBlock_FILE_SYSTEM_BUTTON;
-	public static String URIResolverBlock_WORKSPACE_BUTTON;
-	public static String URIResolverBlock_WORKSPACE_DIALOG_TITLE;
-
-	static
-	{
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, ProcessorMessages.class);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorMessages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorMessages.properties
deleted file mode 100644
index 99167b1..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/ProcessorMessages.properties
+++ /dev/null
@@ -1,92 +0,0 @@
-ProcessorBlock_0=XSLT Processor
-ProcessorBlock_1=Use processor from preferences
-ProcessorBlock_2=Change preferences...
-ProcessorBlock_4=Use specific processor
-ProcessorBlock_6=Processor:
-ProcessorBlock_7=Processor
-ProcessorsComboBlock=XSLT Processor
-ProcessorsComboBlock_0=No XSLT processors defined in workspace
-ProcessorsComboBlock_1=&Installed processors...
-SpecificProcessor=Alternate Processor:
-
-URIResolverBlock_DIRECTORY_NOT_SPECIFIED=URI Resolver directory not specified
-URIResolverBlock_DIRECTORY_DOES_NOT_EXIST=URI Resolver directory does not exist
-URIResolverBlock_DEFAULT_RADIO=Default (resolve URIs relative to the working directory)
-URIResolverBlock_OTHER_RADIO=Other
-URIResolverBlock_DIALOG_MESSAGE=Select an external URI resolver directory
-URIResolverBlock_WORKSPACE_DIALOG_MESSAGE=Select a URI resolver directory in the workspace
-URIResolverBlock_VARIABLES_BUTTON=Variables...
-URIResolverBlock_FILE_SYSTEM_BUTTON=File System...
-URIResolverBlock_WORKSPACE_BUTTON=Workspace...
-URIResolverBlock_WORKSPACE_DIALOG_TITLE=Folder Selection
-
-
-URIResolverBlock_0=Workspace
-URIResolverBlock_1=File System
-URIResolverBlock_17=Variables
-URIResolverBlock_7=Select a base directory for the launch configuration
-URIResolverBlock_4=Select a workspace relative base directory
-URIResolverBlock_19=Other:
-URIResolverBlock_18=Default
-URIResolverBlock_12=Base directory for resolving URIs
-URIResolverBlock_10=Base directory does not exist
-URIResolverBlock_20=Base directory not specified
-URIResolverBlock_3=URI Resolver
-URIResolverBlock_5=Relative to working directory
-URIResolverBlock_6=Relative to (1st) stylesheet
-URIResolverBlock_8=Specific Location:
-URIResolverBlock_Working_Directory_8=URI Resolver
-URIResolverBlock_WORKSPACE_DIALOG_TITLE=Folder Selection
-
-ProcessorDetailsDialog_Title=Built-in XSLT Processor
-ProcessorDetailsDialog_installName=Name:
-ProcessorDetailsDialog_installType=Type:
-ProcessorDetailsDialog_installClasspath=Libraries:
-
-AddProcessorDialog_1=Supported versions:
-AddProcessorDialog_7=Processor must support at least one XSLT version
-AddProcessorDialog_Edit_Title=Edit Processor
-AddProcessorDialog_Add_Title=Add Processor
-AddProcessorDialog_processorName=Processor Name:
-AddProcessorDialog_processorType=Processor Type:
-AddProcessorDialog_jars=Libraries:
-AddProcessorDialog_features=Features:
-AddProcessorDialog_enterName=A name must be entered for this processor
-AddProcessorDialog_duplicateName=The name has already been used
-AddProcessorDialog_Processor_name_must_be_a_valid_file_name=Processor name must be a valid file name
-InstalledProcessorsBlock_0=Installed Java XSLT Processors:
-InstalledProcessorsBlock_1=Name
-InstalledProcessorsBlock_2=Type
-InstalledProcessorsBlock_3=XSLT Versions
-InstalledProcessorsBlock_4=Debugger
-InstalledProcessorsBlock_5=Add
-InstalledProcessorsBlock_6=Edit
-InstalledProcessorsBlock_7=Remove
-InstalledProcessorsBlock_8=None
-
-ProcessorLibraryBlock_6=One or more jar files must be specified
-ProcessorLibraryBlock_AddButton=Add External JARs
-ProcessorLibraryBlock_AddWorkspaceButton=Add Workspace JARs
-ProcessorLibraryBlock_RemoveButton=Remove
-ProcessorLibraryBlock_FileDialog_Title=External JARs
-ProcessorLibraryBlock_WorkspaceFileDialog_Title=Workspace JARs
-ProcessorLibraryBlock_WorkspaceFileDialog_Message=Select the JARs that make up the XSLT processor
-
-ProcessorsUpdater=Save processor settings
-
-
-WorkingDirectoryBlock_1=Default:
-WorkingDirectoryBlock_2=Other:
-WorkingDirectoryBlock_3=Working Directory
-WorkingDirectoryBlock_DIRECTORY_NOT_SPECIFIED=Working directory not specified
-WorkingDirectoryBlock_DIRECTORY_DOES_NOT_EXIST=Working directory does not exist
-WorkingDirectoryBlock_DEFAULT_RADIO=Workspace default
-WorkingDirectoryBlock_OTHER_RADIO=Other
-WorkingDirectoryBlock_DIALOG_MESSAGE=Select an external working directory
-WorkingDirectoryBlock_WORKSPACE_DIALOG_MESSAGE=Select a working directory in the workspace
-WorkingDirectoryBlock_VARIABLES_BUTTON=Variables...
-WorkingDirectoryBlock_FILE_SYSTEM_BUTTON=File System...
-WorkingDirectoryBlock_WORKSPACE_BUTTON=Workspace...
-WorkingDirectoryBlock_WORKSPACE_DIALOG_TITLE=Folder Selection
-
-
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/XSLProcessorTab.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/XSLProcessorTab.java
deleted file mode 100644
index a752872..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/XSLProcessorTab.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.processor;
-
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLLaunchConfigurationTab;
-import org.eclipse.wst.xsl.launching.IProcessorInvoker;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class XSLProcessorTab extends XSLLaunchConfigurationTab
-{
-	private final ProcessorBlock processorBlock;
-	// private WorkingDirectoryBlock workingDirectoryBlock;
-	// private URIResolverBlock2 featuresBlock;
-	private final FeaturesBlock featuresBlock;
-
-	public XSLProcessorTab()
-	{
-		featuresBlock = new FeaturesBlock();
-		processorBlock = new ProcessorBlock(featuresBlock);
-		setBlocks(new ILaunchConfigurationTab[]
-		{ processorBlock, featuresBlock });
-	}
-
-	@Override
-	public void createControl(Composite parent)
-	{
-		super.createControl(parent);
-		Composite comp = (Composite) getControl();
-
-		processorBlock.createControl(comp);
-		featuresBlock.createControl(comp);
-	}
-
-	@Override
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		super.performApply(configuration);
-		// TODO make a new block to allow user to select the invoker
-		IProcessorInvoker invoker = XSLTRuntime.getProcessorInvokers()[0];
-		configuration.setAttribute(XSLLaunchConfigurationConstants.INVOKER_DESCRIPTOR, invoker.getId());
-	}
-
-	public String getName()
-	{
-		return Messages.getString("XSLProcessorTab.0"); //$NON-NLS-1$
-	}
-
-	@Override
-	public Image getImage()
-	{
-		// TODO image
-		return null;
-	}
-
-	@Override
-	public void dispose()
-	{
-		super.dispose();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/messages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/messages.properties
deleted file mode 100644
index f5020aa..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/processor/messages.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-FeaturesBlock.0=Use features from preferences
-FeaturesBlock.1=Change Preferences...
-FeaturesBlock.10=type
-FeaturesBlock.11=value
-FeaturesBlock.12=value
-FeaturesBlock.16=Processor Features
-FeaturesBlock.3=Use specific features
-FeaturesBlock.4=Feature
-FeaturesBlock.5=Type
-FeaturesBlock.6=Value
-FeaturesBlock.9=name
-XSLProcessorTab.0=Processor
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/Messages.java
deleted file mode 100644
index 594e014..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.resolver;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.debug.ui.tabs.resolver.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/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/URIResolverBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/URIResolverBlock.java
deleted file mode 100644
index 190bec9..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/URIResolverBlock.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.resolver;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-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.Text;
-import org.eclipse.wst.xsl.internal.debug.ui.ResourceSelectionBlock;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.ProcessorMessages;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-
-public class URIResolverBlock extends ResourceSelectionBlock
-{
-	private Button stylesheetRelativeRadio;
-	private Button otherRadio;
-	private Button workingDirRelativeRadio;
-
-	public URIResolverBlock()
-	{
-		super(IResource.FOLDER, true, true, true);
-	}
-
-	@Override
-	protected String getMessage(int type)
-	{
-		switch (type)
-		{
-			case ERROR_DIRECTORY_NOT_SPECIFIED:
-				return ProcessorMessages.URIResolverBlock_DIRECTORY_NOT_SPECIFIED;
-			case ERROR_DIRECTORY_DOES_NOT_EXIST:
-				return ProcessorMessages.URIResolverBlock_DIRECTORY_DOES_NOT_EXIST;
-			case GROUP_NAME:
-				return getName();
-			case USE_DEFAULT_RADIO:
-				return ProcessorMessages.URIResolverBlock_DEFAULT_RADIO;
-			case USE_OTHER_RADIO:
-				return ProcessorMessages.URIResolverBlock_OTHER_RADIO;
-			case DIRECTORY_DIALOG_MESSAGE:
-				return ProcessorMessages.URIResolverBlock_DIALOG_MESSAGE;
-			case WORKSPACE_DIALOG_MESSAGE:
-				return ProcessorMessages.URIResolverBlock_WORKSPACE_DIALOG_MESSAGE;
-			case VARIABLES_BUTTON:
-				return ProcessorMessages.URIResolverBlock_VARIABLES_BUTTON;
-			case FILE_SYSTEM_BUTTON:
-				return ProcessorMessages.URIResolverBlock_FILE_SYSTEM_BUTTON;
-			case WORKSPACE_BUTTON:
-				return ProcessorMessages.URIResolverBlock_WORKSPACE_BUTTON;
-			case WORKSPACE_DIALOG_TITLE:
-				return ProcessorMessages.URIResolverBlock_WORKSPACE_DIALOG_TITLE;
-		}
-		return "" + type; //$NON-NLS-1$
-	}
-
-	@Override
-	protected void setDefaultResource()
-	{
-	}
-
-	public String getName()
-	{
-		return ProcessorMessages.URIResolverBlock_3;
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-	}
-
-	@Override
-	protected void createCheckboxAndText(Composite parent)
-	{
-		useDefaultCheckButton = createCheckButton(parent, getMessage(USE_DEFAULT_RADIO));
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 2;
-		useDefaultCheckButton.setLayoutData(gd);
-		useDefaultCheckButton.addSelectionListener(widgetListener);
-
-		Composite specificFileComp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginWidth = 0;
-		layout.marginLeft = 5;
-		layout.marginHeight = 0;
-		specificFileComp.setLayout(layout);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		specificFileComp.setLayoutData(gd);
-
-		SelectionListener listener = new SelectionListener()
-		{
-
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-
-			public void widgetSelected(SelectionEvent e)
-			{
-				updateEnablement(useDefaultCheckButton.getSelection());
-			}
-		};
-
-		workingDirRelativeRadio = createRadioButton(specificFileComp, ProcessorMessages.URIResolverBlock_5);
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		workingDirRelativeRadio.setLayoutData(gd);
-		workingDirRelativeRadio.addSelectionListener(listener);
-
-		stylesheetRelativeRadio = createRadioButton(specificFileComp, ProcessorMessages.URIResolverBlock_6);
-		gd = new GridData();
-		gd.horizontalSpan = 2;
-		stylesheetRelativeRadio.setLayoutData(gd);
-		stylesheetRelativeRadio.addSelectionListener(listener);
-
-		otherRadio = createRadioButton(specificFileComp, ProcessorMessages.URIResolverBlock_8);
-		gd = new GridData();
-		gd.horizontalSpan = 1;
-		otherRadio.setLayoutData(gd);
-		otherRadio.addSelectionListener(listener);
-
-		resourceText = new Text(specificFileComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 1;
-		resourceText.setLayoutData(gd);
-		resourceText.setFont(parent.getFont());
-		resourceText.addModifyListener(widgetListener);
-	}
-
-	@Override
-	protected void updateResourceText(boolean useDefault)
-	{
-		if (useDefault)
-		{
-			resourceText.setText(defaultOutputFile == null ? "" : defaultOutputFile); //$NON-NLS-1$
-		}
-		else
-		{
-			resourceText.setText(outputFile == null ? "" : outputFile); //$NON-NLS-1$
-		}
-		updateEnablement(useDefault);
-	}
-
-	protected void updateEnablement(boolean useDefault)
-	{
-		otherRadio.setEnabled(!useDefault);
-		stylesheetRelativeRadio.setEnabled(!useDefault);
-		workingDirRelativeRadio.setEnabled(!useDefault);
-
-		boolean otherEnabled = !useDefault && otherRadio.getSelection();
-		resourceText.setEnabled(otherEnabled);
-		fFileSystemButton.setEnabled(otherEnabled);
-		fVariablesButton.setEnabled(otherEnabled);
-		fWorkspaceButton.setEnabled(otherEnabled);
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-//		if (workingDirRelativeRadio.getSelection())
-//			configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_BASE_URI_TYPE, XSLLaunchConfigurationConstants.BASE_URI_WORKING_DIR_RELATIVE);
-//		else if (stylesheetRelativeRadio.getSelection())
-//			configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_BASE_URI_TYPE, XSLLaunchConfigurationConstants.BASE_URI_STYLESHEET_RELATIVE);
-//		else if (otherRadio.getSelection())
-//		{
-//			configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_BASE_URI_TYPE, XSLLaunchConfigurationConstants.BASE_URI_ABSOLUTE);
-//			configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_BASE_URI_DIRECTORY, getText());
-//		}
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy config)
-	{
-		config.setAttribute(XSLLaunchConfigurationConstants.ATTR_BASE_URI_DIRECTORY, (String) null);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/URIResolverBlock2.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/URIResolverBlock2.java
deleted file mode 100644
index 13f8c82..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/URIResolverBlock2.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.resolver;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-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.Font;
-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.Text;
-
-public class URIResolverBlock2 extends AbstractLaunchConfigurationTab
-{
-	private Button customRadio;
-	private Text customText;
-	private final ResolverType[] resolverTypes = new ResolverType[]
-	{ new ResolverType(Messages.getString("URIResolverBlock2.0"), Messages.getString("URIResolverBlock2.1")), new ResolverType("org.eclipse.wst.some.resolver.type.1", Messages.getString("URIResolverBlock2.3")) }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	private Button defaultRadio;
-	private Combo combo;
-
-	public void createControl(Composite parent)
-	{
-		Font font = parent.getFont();
-
-		Group group = new Group(parent, SWT.NONE);
-		group.setText(getName());
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		group.setLayoutData(gd);
-		GridLayout layout = new GridLayout(2, false);
-		group.setLayout(layout);
-		group.setFont(font);
-
-		setControl(group);
-
-		defaultRadio = new Button(group, SWT.RADIO);
-		defaultRadio.setText(Messages.getString("URIResolverBlock2.4")); //$NON-NLS-1$
-		defaultRadio.setFont(font);
-		defaultRadio.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				customText.setEnabled(false);
-				combo.setEnabled(true);
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		combo = new Combo(group, SWT.READ_ONLY);
-		ComboViewer cViewer = new ComboViewer(combo);
-		cViewer.setContentProvider(new IStructuredContentProvider()
-		{
-
-			public Object[] getElements(Object inputElement)
-			{
-				return resolverTypes;
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-			}
-		});
-		cViewer.setLabelProvider(new LabelProvider()
-		{
-			@Override
-			public String getText(Object element)
-			{
-				ResolverType type = (ResolverType) element;
-				return type.getDescription();
-			}
-		});
-		cViewer.setInput(resolverTypes);
-		cViewer.setSelection(new StructuredSelection(resolverTypes[0]));
-		cViewer.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		customRadio = new Button(group, SWT.RADIO);
-		customRadio.setText(Messages.getString("URIResolverBlock2.5")); //$NON-NLS-1$
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		customRadio.setLayoutData(gd);
-		gd.horizontalSpan = 2;
-		customRadio.setFont(font);
-		customRadio.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				customText.setEnabled(true);
-				combo.setEnabled(false);
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		Composite textComp = new Composite(group, SWT.NONE);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		gd.horizontalIndent = 10;
-		textComp.setLayoutData(gd);
-		layout = new GridLayout(2, false);
-		layout.marginWidth = 2;
-		textComp.setLayout(layout);
-		textComp.setFont(font);
-
-		Label label = new Label(textComp, SWT.NONE);
-		label.setText(Messages.getString("URIResolverBlock2.6")); //$NON-NLS-1$
-
-		customText = new Text(textComp, SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		customText.setLayoutData(gd);
-		customText.setFont(font);
-		customText.addModifyListener(new ModifyListener()
-		{
-
-			public void modifyText(ModifyEvent e)
-			{
-				updateLaunchConfigurationDialog();
-			}
-		});
-	}
-
-	public String getName()
-	{
-		return Messages.getString("URIResolverBlock2.7"); //$NON-NLS-1$
-	}
-
-	@Override
-	public boolean isValid(ILaunchConfiguration launchConfig)
-	{
-		String text = customText.getText();
-		if (customRadio.getSelection() && (text == null || text.length() == 0))
-		{
-			setErrorMessage(Messages.getString("URIResolverBlock2.8")); //$NON-NLS-1$
-			return false;
-		}
-		return super.isValid(launchConfig);
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	private static class ResolverType
-	{
-		private final String className;
-		private final String description;
-
-		public ResolverType(String className, String description)
-		{
-			this.className = className;
-			this.description = description;
-		}
-
-		public String getClassName()
-		{
-			return className;
-		}
-
-		public String getDescription()
-		{
-			return description;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/WorkingDirectoryBlock.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/WorkingDirectoryBlock.java
deleted file mode 100644
index 9ac720e..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/WorkingDirectoryBlock.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.tabs.resolver;
-
-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.core.variables.IStringVariableManager;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-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.Text;
-import org.eclipse.wst.xsl.internal.debug.ui.ResourceSelectionBlock;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.ProcessorMessages;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-
-public class WorkingDirectoryBlock extends ResourceSelectionBlock
-{
-	private String defaultWorkingDir;
-	private Text defaultText;
-	private Button useSpecificButton;
-
-	public WorkingDirectoryBlock()
-	{
-		super(IResource.FOLDER, false, true, true);
-	}
-
-	@Override
-	protected String getMessage(int type)
-	{
-		switch (type)
-		{
-			case ERROR_DIRECTORY_NOT_SPECIFIED:
-				return ProcessorMessages.WorkingDirectoryBlock_DIRECTORY_NOT_SPECIFIED;
-			case ERROR_DIRECTORY_DOES_NOT_EXIST:
-				return ProcessorMessages.WorkingDirectoryBlock_DIRECTORY_DOES_NOT_EXIST;
-			case GROUP_NAME:
-				return getName();
-			case USE_DEFAULT_RADIO:
-				return ProcessorMessages.WorkingDirectoryBlock_DEFAULT_RADIO;
-			case USE_OTHER_RADIO:
-				return ProcessorMessages.WorkingDirectoryBlock_OTHER_RADIO;
-			case DIRECTORY_DIALOG_MESSAGE:
-				return ProcessorMessages.WorkingDirectoryBlock_DIALOG_MESSAGE;
-			case WORKSPACE_DIALOG_MESSAGE:
-				return ProcessorMessages.WorkingDirectoryBlock_WORKSPACE_DIALOG_MESSAGE;
-			case VARIABLES_BUTTON:
-				return ProcessorMessages.WorkingDirectoryBlock_VARIABLES_BUTTON;
-			case FILE_SYSTEM_BUTTON:
-				return ProcessorMessages.WorkingDirectoryBlock_FILE_SYSTEM_BUTTON;
-			case WORKSPACE_BUTTON:
-				return ProcessorMessages.WorkingDirectoryBlock_WORKSPACE_BUTTON;
-			case WORKSPACE_DIALOG_TITLE:
-				return ProcessorMessages.WorkingDirectoryBlock_WORKSPACE_DIALOG_TITLE;
-		}
-		return "" + type; //$NON-NLS-1$
-	}
-
-	@Override
-	protected void createCheckboxAndText(Composite parent)
-	{
-		Composite specificFileComp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginWidth = 0;
-		layout.marginLeft = 0;
-		layout.marginHeight = 0;
-		specificFileComp.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		specificFileComp.setLayoutData(gd);
-
-		useDefaultCheckButton = createRadioButton(specificFileComp, ProcessorMessages.WorkingDirectoryBlock_1);
-		useDefaultCheckButton.addSelectionListener(widgetListener);
-
-		defaultText = new Text(specificFileComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		defaultText.setLayoutData(gd);
-		defaultText.setFont(parent.getFont());
-		defaultText.setEnabled(false);
-
-		useSpecificButton = createRadioButton(specificFileComp, ProcessorMessages.WorkingDirectoryBlock_2);
-
-		resourceText = new Text(specificFileComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		resourceText.setLayoutData(gd);
-		resourceText.setFont(parent.getFont());
-		resourceText.addModifyListener(widgetListener);
-	}
-
-	@Override
-	protected void setDefaultResource()
-	{
-	}
-
-	public String getName()
-	{
-		return ProcessorMessages.WorkingDirectoryBlock_3;
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		try
-		{
-			setLaunchConfiguration(configuration);
-
-			updateDefaultWorkingDir();
-
-			outputFile = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PROCESSOR_WORKING_DIR, (String) null);
-			boolean useDefault = outputFile == null;
-
-			useDefaultCheckButton.setSelection(useDefault);
-			useSpecificButton.setSelection(!useDefault);
-			resourceText.setEnabled(!useDefault);
-
-			if (useDefault)
-				outputFile = ""; //$NON-NLS-1$
-
-			updateResourceText(useDefault);
-		}
-		catch (CoreException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	@Override
-	protected void updateResourceText(boolean useDefault)
-	{
-		super.updateResourceText(useDefault);
-		defaultText.setText(defaultWorkingDir);
-	}
-
-	public void updateDefaultWorkingDir()
-	{
-		try
-		{
-			ILaunchConfiguration config = getLaunchConfiguration();
-			if (config != null)
-			{
-				String pathExpr = config.getAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, (String) null);
-				if (pathExpr != null)
-				{
-					IPath path = getPath(pathExpr);
-					if (path != null)
-					{
-						path = path.removeLastSegments(1);
-						defaultWorkingDir = path.toPortableString();
-						return;
-					}
-				}
-			}
-		}
-		catch (CoreException ce)
-		{
-		}
-		defaultWorkingDir = System.getProperty("user.dir"); //$NON-NLS-1$
-	}
-
-	private Path getPath(String inputFile)
-	{
-		Path path = null;
-		if (inputFile.indexOf("${") >= 0) //$NON-NLS-1$
-		{
-			IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
-			try
-			{
-				manager.validateStringVariables(inputFile);
-				path = new Path(manager.performStringSubstitution(inputFile));
-			}
-			catch (CoreException e)
-			{
-			}
-		}
-		else if (inputFile.length() > 0)
-		{
-			path = new Path(inputFile);
-		}
-		return path;
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		boolean useDefault = useDefaultCheckButton.getSelection();
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR_WORKING_DIR, useDefault);
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_PROCESSOR_WORKING_DIR, useDefault ? null : getText());
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR_WORKING_DIR, true);
-	}
-
-	@Override
-	public boolean isValid(ILaunchConfiguration config)
-	{
-		required = useSpecificButton.getSelection();
-		return super.isValid(config);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/messages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/messages.properties
deleted file mode 100644
index ee85c38..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/resolver/messages.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-URIResolverBlock2.0=N/A
-URIResolverBlock2.1=Working Directory (default)
-URIResolverBlock2.3=Stylesheet
-URIResolverBlock2.4=Resolve relative to:
-URIResolverBlock2.5=Use custom URI resolver (Note: class must be included on classpath)
-URIResolverBlock2.6=Class:
-URIResolverBlock2.7=URI Resolver
-URIResolverBlock2.8=Missing URI Resolver class name
diff --git a/bundles/org.eclipse.wst.xsl.launching/.classpath b/bundles/org.eclipse.wst.xsl.launching/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsl.launching/.cvsignore b/bundles/org.eclipse.wst.xsl.launching/.cvsignore
deleted file mode 100644
index d4a255d..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-javaCompiler...args
-temp.folder
-@dot
diff --git a/bundles/org.eclipse.wst.xsl.launching/.project b/bundles/org.eclipse.wst.xsl.launching/.project
deleted file mode 100644
index 86b41f9..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.launching</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/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 3bacc8f..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jan 03 22:24:25 EST 2008
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 198f7ee..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Jan 04 01:02:13 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/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 1c5d1f1..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Fri Jan 04 09:12:34 EST 2008
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.missing-bundle-classpath-entries=0
-compilers.p.missing-packages=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=1
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.xsl.launching/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.launching/META-INF/MANIFEST.MF
deleted file mode 100644
index 200bf3b..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsl.launching;singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.wst.xsl.internal.launching.LaunchingPlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xsl.debug;bundle-version="[0.5.0,1.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .
-Export-Package: org.eclipse.wst.xsl.launching,
- org.eclipse.wst.xsl.launching.config,
- org.eclipse.wst.xsl.launching.model
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
diff --git a/bundles/org.eclipse.wst.xsl.launching/TODO.txt b/bundles/org.eclipse.wst.xsl.launching/TODO.txt
deleted file mode 100644
index 9d478de..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/TODO.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-INTEGRATE ORANGEVOLT PARTS:
-
-- launch configuration type image
-- keywords
-- launch config export
-
-- when debugging too quickly, get a null pointer exception because variable view is trying to 
-get a variable at the same time as we have moved on to the next frame.
-
-- smooth transition between java and XSLT debugging
-- result view
-- link from result view to source + template
-- profiling
-
-- change variable value
-- watch expressions
-- breakpoint hit count 
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.launching/W3CFeatures.properties b/bundles/org.eclipse.wst.xsl.launching/W3CFeatures.properties
deleted file mode 100644
index 9c244d2..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/W3CFeatures.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Doug Satchwell (Chase Technology Ltd) - initial API and implementation
-###############################################################################
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.launching/W3COutputProperties.properties b/bundles/org.eclipse.wst.xsl.launching/W3COutputProperties.properties
deleted file mode 100644
index 85d2fb3..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/W3COutputProperties.properties
+++ /dev/null
@@ -1,57 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Doug Satchwell (Chase Technology Ltd) - initial API and implementation
-###############################################################################
-byte-order-mark=byte-order-mark
-byte-order-mark.DESC=One of the enumerated values yes or no. This parameter indicates whether the serialized sequence of octets is to be preceded by a Byte Order Mark. (See Section 5.1 of [Unicode Encoding].) The actual octet order used is implementation-dependent. If the encoding defines no Byte Order Mark, or if the Byte Order Mark is prohibited for the specific Unicode encoding or implementation environment, then this parameter is ignored. 
-
-cdata-section-elements=cdata-section-elements 
-cdata-section-elements.DESC=A list of expanded QNames, possibly empty. 
-
-doctype-public=doctype-public
-doctype-public.DESC=A string of Unicode characters. This parameter may be absent. 
-
-doctype-system=doctype-system
-doctype-system.DESC=A string of Unicode characters. This parameter may be absent. 
-
-encoding=encoding 
-encoding.DESC=A string of Unicode characters in the range #x21 to #x7E (that is, printable ASCII characters); the value SHOULD be a charset registered with the Internet Assigned Numbers Authority [IANA], [RFC2278] or begin with the characters x- or X-. 
-
-escape-uri-attributes=escape-uri-attributes
-escape-uri-attributes.DESC=One of the enumerated values yes or no. 
-
-include-content-type=include-content-type
-include-content-type.DESC=One of the enumerated values yes or no. 
-
-indent=indent
-indent.DESC=One of the enumerated values yes or no. 
-
-media-type=media-type
-media-type.DESC=A string of Unicode characters specifying the media type (MIME content type) [RFC2046]; the charset parameter of the media type MUST NOT be specified explicitly in the value of the media-type parameter. If the destination of the serialized output is annotated with a media type, this parameter MAY be used to provide such an annotation. For example, it MAY be used to set the media type in an HTTP header. 
-
-method=method
-method.DESC=An expanded QName with a null namespace URI, and the local part of the name equal to one of xml, xhtml, html or text, or having a non-null namespace URI. If the namespace URI is non-null, the parameter specifies an implementation-defined output method. 
-
-normalization-form=normalization-form 
-normalization-form.DESC=One of the enumerated values NFC, NFD, NFKC, NFKD, fully-normalized, none or an implementation-defined value. 
-
-omit-xml-declaration=omit-xml-declaration 
-omit-xml-declaration.DESC=One of the enumerated values yes or no. 
-
-standalone=standalone 
-standalone.DESC=One of the enumerated values yes, no or omit. 
-
-undeclare-prefixes=undeclare-prefixes 
-undeclare-prefixes.DESC=One of the enumerated values yes or no. 
-
-use-character-maps=use-character-maps 
-use-character-maps.DESC=A list of pairs, possibly empty, with each pair consisting of a single Unicode character and a string of Unicode characters. 
-
-version=version 
-version.DESC=A string of Unicode characters. 
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.launching/about.html b/bundles/org.eclipse.wst.xsl.launching/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</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/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</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>
diff --git a/bundles/org.eclipse.wst.xsl.launching/build.properties b/bundles/org.eclipse.wst.xsl.launching/build.properties
deleted file mode 100644
index bb144c6..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               W3CFeatures.properties,\
-               W3COutputProperties.properties,\
-               schema/,\
-               about.html,\
-               plugin.properties
-jars.compile.order = .
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.launching/plugin.properties b/bundles/org.eclipse.wst.xsl.launching/plugin.properties
deleted file mode 100644
index af6a7de..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.launching
-Bundle-Name.0 = XSL Launching Plug-in (Incubating)
-launchConfigurationType.name.0 = XSL
-sourceLocator.name.0 = XSLT Source Lookup Director
-processorType.label.0 = JRE Default
-processor.label.0 = JRE Instance Default
-extension-point.name.0 = XSLT Processor Invoker
-extension-point.name.1 = XSLT Processor Type
-extension-point.name.2 = XSLT Processor
-extension-point.name.3 = XSLT Debugger
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.launching/plugin.xml b/bundles/org.eclipse.wst.xsl.launching/plugin.xml
deleted file mode 100644
index a032788..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/plugin.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-	<extension-point id="invoke" name="%extension-point.name.0"
-		schema="schema/invoke.exsd" />
-	<extension-point id="processorType" name="%extension-point.name.1"
-		schema="schema/processorType.exsd" />
-	<extension-point id="processor" name="%extension-point.name.2"
-		schema="schema/processor.exsd" />
-	<extension-point id="debugger" name="%extension-point.name.3" schema="schema/debugger.exsd"/>
-
-	<extension
-		point="org.eclipse.debug.core.launchConfigurationTypes">
-		<launchConfigurationType
-            sourceLocatorId="org.eclipse.wst.xsl.launching.sourceLookupDirector"
-            sourcePathComputerId="org.eclipse.wst.xsl.launching.sourcePathComputer"
-			delegate="org.eclipse.wst.xsl.internal.launching.XSLTLaunchConfigurationDelegate"
-			id="org.eclipse.wst.xsl.launching.launchConfigurationType"
-			modes="run, debug, profile" name="%launchConfigurationType.name.0" />
-	</extension>
-	
-   <extension
-         point="org.eclipse.debug.core.sourceLocators">
-      <sourceLocator
-            name="%sourceLocator.name.0"
-            class="org.eclipse.wst.xsl.internal.launching.XSLTSourceLookupDirector"
-            id="org.eclipse.wst.xsl.launching.sourceLookupDirector">
-      </sourceLocator>
-   </extension>
-   
-   <extension
-         point="org.eclipse.debug.core.sourcePathComputers">
-      <sourcePathComputer
-            class="org.eclipse.wst.xsl.internal.launching.XSLTSourcePathComputerDelegate"
-            id="org.eclipse.wst.xsl.launching.sourcePathComputer">
-      </sourcePathComputer>
-   </extension>
-	
-   <extension
-         point="org.eclipse.debug.core.breakpoints">
-      <breakpoint
-      		id="xslLineBreakpoint"
-            markerType="org.eclipse.wst.xsl.launching.xslLineBreakpointMarker"
-            class="org.eclipse.wst.xsl.launching.model.XSLLineBreakpoint">
-      </breakpoint>
-   </extension>
-
-   <extension
-         id="xslLineBreakpointMarker"
-         point="org.eclipse.core.resources.markers">
-      <super
-            type="org.eclipse.debug.core.lineBreakpointMarker">
-      </super>
-      <persistent
-            value="true">
-      </persistent>
-   </extension>
- 	
-	<extension point="org.eclipse.core.runtime.preferences">
-		<initializer
-			class="org.eclipse.wst.xsl.internal.launching.PreferenceInitializer">
-		</initializer>
-	</extension>
- 
- 	<extension
-	       point="org.eclipse.wst.xsl.launching.processorType">
-     <processorType
-            featureProperties="W3CProcessorFeatures.properties"
-            id="org.eclipse.wst.xsl.launching.processorType.jreDefault"
-            label="%processorType.label.0"
-            outputProperties="W3COutputProperties.properties" />
-	 </extension>
-
-	<extension
-	         point="org.eclipse.wst.xsl.launching.processor">
-        <processor
-              classpath=""
-              id="org.eclipse.wst.xsl.launching.jre.default"
-              label="%processor.label.0"
-              processorTypeId="org.eclipse.wst.xsl.launching.processorType.jreDefault"
-              supports="1.0"/>
-	 </extension>
-	
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsl.launching/schema/debugger.exsd b/bundles/org.eclipse.wst.xsl.launching/schema/debugger.exsd
deleted file mode 100644
index d7d27e2..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/schema/debugger.exsd
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.xsl.launching">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.xsl.launching" id="debugger" name="XSLT Debugger"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is internal and should not be used by any other plugins.&lt;/b&gt;
-      </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="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="classpath" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="processorTypeId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="className" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is internal and should not be used by any other plugins.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2007 Chase Technology Ltd - &lt;a href=&quot;http://www.chasetechnology.co.uk&quot;&gt;http://www.chasetechnology.co.uk&lt;/a&gt;.&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;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.xsl.launching/schema/invoke.exsd b/bundles/org.eclipse.wst.xsl.launching/schema/invoke.exsd
deleted file mode 100644
index e456d2e..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/schema/invoke.exsd
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.xsl.launching">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.xsl.launching" id="invoke" name="XSLT Processor Invoker"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is internal and should not be used by any other plugins.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="invoker"/>
-         </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="invoker">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Unique id for this invoker
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A class that implements the IProcessorInvoker interface
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="classpath" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A semi-colon separated list of jars relative to the root of the contributing plugin. One of the jars must contain the Invoker class named in the class attribute.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is internal and should not be used by any other plugins.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2007 Chase Technology Ltd - &lt;a href=&quot;http://www.chasetechnology.co.uk&quot;&gt;http://www.chasetechnology.co.uk&lt;/a&gt;.&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;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.xsl.launching/schema/processor.exsd b/bundles/org.eclipse.wst.xsl.launching/schema/processor.exsd
deleted file mode 100644
index aa345fa..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/schema/processor.exsd
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.xsl.launching">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.xsl.launching" id="processor" name="XSLT Processor"/>
-      </appInfo>
-      <documentation>
-         Contribute a Java XSLT processor instance (e.g. Xalan 2.7.0). The extension point primarily defines the classpath to be used when launching an XSLT transformation.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="processor" 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="processor">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="label"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="processorTypeId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="classpath" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="debuggerId" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="supports" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A comma-separated list of supported XSLT versions e.g. 1.0,2.0
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.xsl.launching.processor&quot;&gt;
-      &lt;processor
-            classpath=&quot;xalan2.7.0.jar;serializer2.7.0.jar&quot;
-            id=&quot;org.eclipse.wst.xsl.launching.xalan.2_7_0&quot;
-            label=&quot;Xalan 2.7.0&quot;
-            processorTypeId=&quot;org.eclipse.wst.xsl.xalan.processorType&quot;
-            debuggerId=&quot;org.eclipse.wst.xsl.xalan.debugger&quot;
-            supports=&quot;1.0&quot;&gt;
-      &lt;/processor&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2007 Chase Technology Ltd - &lt;a href=&quot;http://www.chasetechnology.co.uk&quot;&gt;http://www.chasetechnology.co.uk&lt;/a&gt;.&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;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.xsl.launching/schema/processorType.exsd b/bundles/org.eclipse.wst.xsl.launching/schema/processorType.exsd
deleted file mode 100644
index bf96fe3..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/schema/processorType.exsd
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.xsl.launching">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.xsl.launching" id="processorType" name="XSLT Processor Type"/>
-      </appInfo>
-      <documentation>
-         Contribute a Java XSLT processor type (e.g. Xalan, Saxon). The processor type defines which features and output properies are supported.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="processorType" 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="processorType">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="label"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Unique id for the processor type
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Name for display in the UI
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="transformerFactory" type="string">
-            <annotation>
-               <documentation>
-                  Transformer factory class name for this processor type
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="outputProperties" type="string">
-            <annotation>
-               <documentation>
-                  Location of a properties file containing the list of the processors output properties. Must be a path relative to the root of the bundle.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="featureProperties" type="string">
-            <annotation>
-               <documentation>
-                  Location of a properties file containing the list of the features supported by this processor. Must be a path relative to the root of the bundle.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         &lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.xsl.launching.processorType&quot;&gt;
-      &lt;processorType
-            featureProperties=&quot;XalanFeatures.properties&quot;
-            id=&quot;org.eclipse.wst.xsl.xalan.processorType&quot;
-            label=&quot;Xalan&quot;
-            outputProperties=&quot;XalanOutputProperties.properties&quot;
-            transformerFactory=&quot;org.apache.xalan.processor.TransformerFactoryImpl&quot;&gt;
-      &lt;/processorType&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2007 Chase Technology Ltd - &lt;a href=&quot;http://www.chasetechnology.co.uk&quot;&gt;http://www.chasetechnology.co.uk&lt;/a&gt;.&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;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/DebuggerDescriptor.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/DebuggerDescriptor.java
deleted file mode 100644
index 59c6dd9..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/DebuggerDescriptor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.launching.IDebugger;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class DebuggerDescriptor implements IDebugger
-{
-	private final String[] classpath;
-	private final String id;
-	private final String bundleId;
-	private final String name;
-	private final String processorTypeId;
-	private final String className;
-
-	public DebuggerDescriptor(String id, String bundleId, String className, String[] classpath, String name, String processorTypeId)
-	{
-		this.id = id;
-		this.classpath = classpath;
-		this.bundleId = bundleId;
-		this.name = name;
-		this.processorTypeId = processorTypeId;
-		this.className = className;
-	}
-
-	public String getClassName()
-	{
-		return className;
-	}
-
-	public String[] getClassPath()
-	{
-		List<String> entries = new ArrayList<String>();
-		try 
-		{
-			// in dev, add the bin dir
-			if (Platform.inDevelopmentMode())
-				entries.add(Utils.getFileLocation(bundleId, "/bin")); //$NON-NLS-1$
-			for (String jar : classpath)
-			{
-				String entry = Utils.getFileLocation(bundleId, "/" + jar); //$NON-NLS-1$
-				if (entry!=null)
-					entries.add(entry);
-			}
-		} 
-		catch (CoreException e) 
-		{
-			LaunchingPlugin.log(e);
-		}
-		return entries.toArray(new String[0]);
-	}
-
-	public String getId()
-	{
-		return id;
-	}
-
-	public String getName()
-	{
-		return name;
-	}
-
-	public IProcessorType getProcessorType()
-	{
-		return XSLTRuntime.getProcessorType(processorTypeId);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/Feature.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/Feature.java
deleted file mode 100644
index 266900b..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/Feature.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.wst.xsl.launching.IFeature;
-
-public class Feature implements IFeature, Comparable<Object>
-{
-	private final String uri;
-	private final String description;
-	private final String type;
-
-	public Feature(String uri, String type, String description)
-	{
-		this.uri = uri;
-		this.type = type;
-		this.description = description;
-	}
-
-	public String getDescription()
-	{
-		return description;
-	}
-
-	public String getType()
-	{
-		return type;
-	}
-
-	public String getURI()
-	{
-		return uri;
-	}
-
-	public IStatus validateValue(String value)
-	{
-		IStatus status = null;
-		if (TYPE_BOOLEAN.equals(type))
-		{
-			boolean valid = "true".equals(value) || "false".equals(value); //$NON-NLS-1$ //$NON-NLS-2$
-			if (!valid)
-				status = new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, 0, Messages.getString("Feature.2"), null); //$NON-NLS-1$
-		}
-		else if (TYPE_INT.equals(type))
-		{
-			try
-			{
-				Integer.parseInt(value);
-			}
-			catch (NumberFormatException e)
-			{
-				status = new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, 0, Messages.getString("Feature.1"), null); //$NON-NLS-1$
-			}
-		}
-		else if (TYPE_DOUBLE.equals(type))
-		{
-			try
-			{
-				Double.parseDouble(value);
-			}
-			catch (NumberFormatException e)
-			{
-				status = new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, 0, Messages.getString("Feature.0"), null); //$NON-NLS-1$
-			}
-		}
-		else if (TYPE_FLOAT.equals(type))
-		{
-			try
-			{
-				Float.parseFloat(value);
-			}
-			catch (NumberFormatException e)
-			{
-				status = new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, 0, Messages.getString("Feature.5"), null); //$NON-NLS-1$
-			}
-		}
-		else if (TYPE_CLASS.equals(type) || TYPE_OBJECT.equals(type))
-		{
-			status = JavaConventions.validateJavaTypeName(value);
-		}
-		return status;
-	}
-
-	public int compareTo(Object o)
-	{
-		if (o instanceof IFeature)
-		{
-			IFeature f = (IFeature) o;
-			return f.getURI().compareTo(getURI());
-		}
-		return 0;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/FeaturePreferences.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/FeaturePreferences.java
deleted file mode 100644
index 8bacde7..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/FeaturePreferences.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class FeaturePreferences
-{
-	private Map<String, Map<String, String>> typeFeatures;
-
-	public Map<String, String> getFeaturesValues(String typeId)
-	{
-		return typeFeatures.get(typeId);
-	}
-
-	public void setTypeFeatures(Map<String, Map<String, String>> typeFeatures)
-	{
-		this.typeFeatures = typeFeatures;
-	}
-
-	public String getAsXML() throws ParserConfigurationException, IOException, TransformerException
-	{
-		Document doc = PreferenceUtil.getDocument();
-		Element config = doc.createElement("featurePreferences");  //$NON-NLS-1$
-		doc.appendChild(config);
-		
-		for (String typeId : typeFeatures.keySet())
-		{
-			Element processorTypeElement = typeAsElement(doc, typeId);
-			Map<String, String> featureValues = typeFeatures.get(typeId);
-			featureValuesAsElement(doc, processorTypeElement, featureValues);
-			config.appendChild(processorTypeElement);
-		}
-
-		// Serialize the Document and return the resulting String
-		return PreferenceUtil.serializeDocument(doc);
-	}
-
-	public static FeaturePreferences fromXML(InputStream inputStream) throws CoreException
-	{
-		FeaturePreferences prefs = new FeaturePreferences();
-
-		// Do the parsing and obtain the top-level node
-		Document doc = PreferenceUtil.getDocument(inputStream);
-		Element config = doc.getDocumentElement();
-
-		Map<String, Map<String, String>> typeFeatures = new HashMap<String, Map<String, String>>();
-		Element[] processorTypeEls = PreferenceUtil.getChildElements(config, "processorType"); //$NON-NLS-1$
-		for (int i = 0; i < processorTypeEls.length; ++i)
-		{
-			Element processorTypeEl = processorTypeEls[i];
-			String type = elementAsType(processorTypeEl);
-			Map<String, String> featureValues = elementAsFeatureValues(processorTypeEl);
-			typeFeatures.put(type, featureValues);
-		}
-
-		prefs.setTypeFeatures(typeFeatures);
-
-		return prefs;
-	}
-
-	private static String elementAsType(Element parent)
-	{
-		String id = parent.getAttribute("id"); //$NON-NLS-1$
-		return id;
-	}
-
-	private static Element typeAsElement(Document doc, String type)
-	{
-		Element element = doc.createElement("processorType"); //$NON-NLS-1$
-		element.setAttribute("id", type); //$NON-NLS-1$
-		return element;
-	}
-
-	private static Map<String, String> elementAsFeatureValues(Element element)
-	{
-		Element[] featureEls = PreferenceUtil.getChildElements(element, "feature"); //$NON-NLS-1$
-		Map<String, String> featureValues = new HashMap<String, String>(featureEls.length);
-		for (Element featureEl : featureEls)
-		{
-			String uri = featureEl.getAttribute("uri"); //$NON-NLS-1$
-			String value = featureEl.getAttribute("value"); //$NON-NLS-1$
-			featureValues.put(uri, value);
-		}
-		return featureValues;
-	}
-
-	private static void featureValuesAsElement(Document doc, Element featuresEl, Map<String, String> featureValues)
-	{
-		if (featureValues != null)
-		{
-			for (Map.Entry<String,String> entry2 : featureValues.entrySet())
-			{
-				String uri = (String) entry2.getKey();
-				String value = (String) entry2.getValue();
-				Element element = doc.createElement("feature"); //$NON-NLS-1$
-				element.setAttribute("uri", uri); //$NON-NLS-1$
-				element.setAttribute("value", value); //$NON-NLS-1$
-				featuresEl.appendChild(element);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/LaunchingPlugin.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/LaunchingPlugin.java
deleted file mode 100644
index d8abb17..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/LaunchingPlugin.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-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.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class LaunchingPlugin extends Plugin
-{
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.xsl.launching"; //$NON-NLS-1$
-
-	// The shared instance
-	private static LaunchingPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public LaunchingPlugin()
-	{
-		plugin = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception
-	{
-		super.start(context);
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception
-	{
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static LaunchingPlugin getDefault()
-	{
-		return plugin;
-	}
-
-	public static void log(Exception e)
-	{
-		getDefault().getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, 0, "", e)); //$NON-NLS-1$
-	}
-
-	public static void log(CoreException e)
-	{
-		getDefault().getLog().log(e.getStatus());
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/Messages.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/Messages.java
deleted file mode 100644
index f153824..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.launching.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/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/OutputProperty.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/OutputProperty.java
deleted file mode 100644
index aa9df1d..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/OutputProperty.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import org.eclipse.wst.xsl.launching.IOutputProperty;
-
-public class OutputProperty implements IOutputProperty
-{
-	private final String name;
-	private final String desc;
-
-	public OutputProperty(String key, String desc)
-	{
-		this.name = key;
-		this.desc = desc;
-	}
-
-	public String getDescription()
-	{
-		return desc;
-	}
-
-	public String getURI()
-	{
-		return name;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/OutputPropertyPreferences.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/OutputPropertyPreferences.java
deleted file mode 100644
index e8b919f..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/OutputPropertyPreferences.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class OutputPropertyPreferences
-{
-	private final Map<String, Properties> typeProperties = new HashMap<String, Properties>();
-
-	public Properties getOutputPropertyValues(String typeId)
-	{
-		return (Properties) typeProperties.get(typeId);
-	}
-
-	public void setOutputPropertyValues(String typeId, Properties properties)
-	{
-		typeProperties.put(typeId, properties);
-	}
-
-	public String getAsXML() throws ParserConfigurationException, IOException, TransformerException
-	{
-		Document doc = PreferenceUtil.getDocument();
-		Element config = doc.createElement("outputPropertyPreferences"); //$NON-NLS-1$
-		doc.appendChild(config);
-
-		for (String type : typeProperties.keySet())
-		{
-			Element processorTypeElement = typeAsElement(doc, type);
-			Properties propertyValues = (Properties) typeProperties.get(type);
-			featureValuesAsElement(doc, processorTypeElement, propertyValues);
-			config.appendChild(processorTypeElement);
-		}
-
-		// Serialize the Document and return the resulting String
-		return PreferenceUtil.serializeDocument(doc);
-	}
-
-	public static OutputPropertyPreferences fromXML(InputStream inputStream) throws CoreException
-	{
-		OutputPropertyPreferences prefs = new OutputPropertyPreferences();
-
-		// Do the parsing and obtain the top-level node
-		Document doc = PreferenceUtil.getDocument(inputStream);
-		Element config = doc.getDocumentElement();
-
-		Element[] processorTypeEls = PreferenceUtil.getChildElements(config, "processorType"); //$NON-NLS-1$
-		for (int i = 0; i < processorTypeEls.length; ++i)
-		{
-			Element processorTypeEl = processorTypeEls[i];
-			String type = elementAsType(processorTypeEl);
-			Properties featureValues = elementAsPropertyValues(processorTypeEl);
-			prefs.setOutputPropertyValues(type, featureValues);
-		}
-
-		return prefs;
-	}
-
-	private static String elementAsType(Element parent)
-	{
-		String id = parent.getAttribute("id"); //$NON-NLS-1$
-		return id;
-	}
-
-	private static Element typeAsElement(Document doc, String type)
-	{
-		Element element = doc.createElement("processorType"); //$NON-NLS-1$
-		element.setAttribute("id", type); //$NON-NLS-1$
-		return element;
-	}
-
-	private static Properties elementAsPropertyValues(Element element)
-	{
-		Element[] propertyEls = PreferenceUtil.getChildElements(element, "property"); //$NON-NLS-1$
-		Properties propertyValues = new Properties();
-		for (Element featureEl : propertyEls)
-		{
-			String name = featureEl.getAttribute("name"); //$NON-NLS-1$
-			String value = featureEl.getAttribute("value"); //$NON-NLS-1$
-			propertyValues.put(name, value);
-		}
-		return propertyValues;
-	}
-
-	private static void featureValuesAsElement(Document doc, Element featuresEl, Properties propertyValues)
-	{
-		if (propertyValues != null)
-		{
-			for (Map.Entry<Object,Object> entry2 : propertyValues.entrySet())
-			{
-				String name = (String) entry2.getKey();
-				String value = (String) entry2.getValue();
-				Element element = doc.createElement("property"); //$NON-NLS-1$
-				element.setAttribute("name", name); //$NON-NLS-1$
-				element.setAttribute("value", value); //$NON-NLS-1$
-				featuresEl.appendChild(element);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/PluginProcessorJar.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/PluginProcessorJar.java
deleted file mode 100644
index da8751b..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/PluginProcessorJar.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.launching.IProcessorJar;
-import org.osgi.framework.Bundle;
-
-public class PluginProcessorJar implements IProcessorJar
-{
-	private final String pluginId;
-	private final IPath path;
-
-	public PluginProcessorJar(String pluginId, IPath path)
-	{
-		this.pluginId = pluginId;
-		this.path = path;
-	}
-
-	public URL asURL()
-	{
-		URL url = null;
-		try
-		{
-			// FIXME very clumsy way to get location orbit jar file
-			// There is surely a better way, but I can'd find it.
-			if (path == null)
-			{
-				url = Platform.getBundle(pluginId).getEntry("/"); //$NON-NLS-1$
-				url = FileLocator.resolve(url);
-				String s = url.getPath();
-				if (s.endsWith("!/")) //$NON-NLS-1$
-				{
-					s = s.substring(0,s.length()-2);
-				}
-				System.out.println(s);
-				url = new URL(s);
-			}
-			else
-			{
-				Bundle bundle = Platform.getBundle(pluginId);
-				IPath jarPath = new Path("/" + path); //$NON-NLS-1$
-				url = FileLocator.find(bundle, jarPath, null);
-				if (url != null)
-					url = FileLocator.resolve(url);
-			}
-		}
-		catch (IOException e)
-		{
-			LaunchingPlugin.log(e);
-		}
-		return url;
-	}
-
-	public IPath getPath()
-	{
-		return path;
-	}
-
-	@Override
-	public String toString()
-	{
-		return "Plugin " + pluginId + Messages.getString("PluginProcessorJar.0") + path; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/PreferenceInitializer.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/PreferenceInitializer.java
deleted file mode 100644
index 11a092c..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/PreferenceInitializer.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-/**
- * Class used to initialize default preference values.
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer
-{
-
-	@Override
-	public void initializeDefaultPreferences()
-	{
-		IEclipsePreferences node = new DefaultScope().getNode(LaunchingPlugin.PLUGIN_ID);
-
-		ProcessorPreferences prefs = new ProcessorPreferences();
-		prefs.setDefaultProcessorId(XSLTRuntime.JRE_DEFAULT_PROCESSOR_ID);
-
-		OutputPropertyPreferences outputPrefs = new OutputPropertyPreferences();
-		outputPrefs.setOutputPropertyValues(XSLTRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID, XSLTRuntime.createDefaultOutputProperties(XSLTRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID));
-		outputPrefs.setOutputPropertyValues(XSLLaunchConfigurationConstants.XALAN_TYPE_ID, XSLTRuntime.createDefaultOutputProperties(XSLLaunchConfigurationConstants.XALAN_TYPE_ID));
-		outputPrefs.setOutputPropertyValues(XSLLaunchConfigurationConstants.SAXONB_TYPE_ID, XSLTRuntime.createDefaultOutputProperties(XSLLaunchConfigurationConstants.SAXONB_TYPE_ID));
-
-		try
-		{
-			String xml = prefs.getAsXML();
-			node.put(XSLTRuntime.PREF_PROCESSOR_XML, xml);
-
-			xml = outputPrefs.getAsXML();
-			node.put(XSLTRuntime.PREF_OUTPUT_PROPERTIES_XML, xml);
-
-			node.put(XSLLaunchConfigurationConstants.ATTR_DEFAULT_DEBUGGING_INSTALL_ID, "org.eclipse.wst.xsl.launching.xalan.processor"); //$NON-NLS-1$
-		}
-		catch (ParserConfigurationException e)
-		{
-			LaunchingPlugin.log(e);
-		}
-		catch (IOException e)
-		{
-			LaunchingPlugin.log(e);
-		}
-		catch (TransformerException e)
-		{
-			LaunchingPlugin.log(e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/PreferenceUtil.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/PreferenceUtil.java
deleted file mode 100644
index a12c152..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/PreferenceUtil.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.io.ByteArrayOutputStream;
-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.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-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.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-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;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class PreferenceUtil
-{
-
-	public static void createCoreException(Throwable e) throws CoreException
-	{
-		throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, 0, e.getMessage(), e));
-	}
-
-	public static Document getDocument() throws ParserConfigurationException
-	{
-		DocumentBuilderFactory dfactory = DocumentBuilderFactory.newInstance();
-		DocumentBuilder docBuilder = dfactory.newDocumentBuilder();
-		Document doc = docBuilder.newDocument();
-		return doc;
-	}
-
-	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");  //$NON-NLS-1$
-		transformer.setOutputProperty(OutputKeys.INDENT, "yes");  //$NON-NLS-1$
-
-		DOMSource source = new DOMSource(doc);
-		StreamResult outputTarget = new StreamResult(s);
-		transformer.transform(source, outputTarget);
-
-		return s.toString("UTF8"); 			 //$NON-NLS-1$
-	}
-
-	public static Element[] getChildElements(Element parent, String name)
-	{
-		List<Element> children = new ArrayList<Element>();
-		NodeList list = parent.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 processorElement = (Element) node;
-				if (processorElement.getNodeName().equals(name))
-				{
-					children.add(processorElement);
-				}
-			}
-		}
-		return (Element[]) children.toArray(new Element[0]);
-	}
-
-	public static String getNodeText(Node node)
-	{
-		switch (node.getNodeType())
-		{
-			case Node.ELEMENT_NODE:
-				NodeList childNodes = node.getChildNodes();
-				StringBuffer sb = new StringBuffer();
-				for (int i = 0; i < childNodes.getLength(); i++)
-				{
-					Node child = childNodes.item(i);
-					if (child.getNodeType() == Node.TEXT_NODE)
-					{
-						sb.append(child.getNodeValue());
-					}
-				}
-				return sb.toString();
-			case Node.TEXT_NODE:
-			case Node.ATTRIBUTE_NODE:
-			default:
-				return node.getNodeValue();
-		}
-	}
-
-	public static Document getDocument(InputStream stream) throws CoreException
-	{
-		Document doc = null;
-		try
-		{
-			DocumentBuilder parser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			parser.setErrorHandler(new DefaultHandler());
-			doc = parser.parse(new InputSource(stream));
-		}
-		catch (SAXException e)
-		{
-			PreferenceUtil.createCoreException(e);
-		}
-		catch (IOException e)
-		{
-			PreferenceUtil.createCoreException(e);
-		}
-		catch (ParserConfigurationException e)
-		{
-			PreferenceUtil.createCoreException(e);
-		}
-		catch (FactoryConfigurationError e)
-		{
-			PreferenceUtil.createCoreException(e);
-		}
-		finally
-		{
-			try
-			{
-				stream.close();
-			}
-			catch (IOException e)
-			{
-				PreferenceUtil.createCoreException(e);
-			}
-		}
-		return doc;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorInvokerDescriptor.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorInvokerDescriptor.java
deleted file mode 100644
index 44e0d65..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorInvokerDescriptor.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.launching.IProcessorInvoker;
-
-public class ProcessorInvokerDescriptor implements IProcessorInvoker
-{
-
-	private final String invokerClass;
-	private final String[] classpath;
-	private final String id;
-	private final String bundleId;
-
-	public ProcessorInvokerDescriptor(String id, String bundleId, String invokerClass, String[] classpath)
-	{
-		this.id = id;
-		this.bundleId = bundleId;
-		this.invokerClass = invokerClass;
-		this.classpath = classpath;
-	}
-
-	public String[] getClasspathEntries()
-	{
-		List<String> entries = new ArrayList<String>();
-		try {
-			// if in dev mode, use the bin dir
-			if (Platform.inDevelopmentMode())
-				entries.add(Utils.getFileLocation(bundleId, "/bin")); //$NON-NLS-1$
-			for (int i=0;i <classpath.length;i++) 
-			{
-				String string = classpath[i];
-				String entry;
-				if (string.startsWith("${eclipse_orbit:") && string.endsWith("}")) //$NON-NLS-1$ //$NON-NLS-2$
-				{
-					string = string.substring("${eclipse_orbit:".length()); //$NON-NLS-1$
-					string = string.substring(0,string.length()-1);
-					entry = Utils.getFileLocation(string,""); //$NON-NLS-1$
-				}
-				else
-				{
-					entry = Utils.getFileLocation(bundleId,string);
-				}
-				if (entry!=null)
-					entries.add(entry);
-			}
-		} 
-		catch (CoreException e) 
-		{
-			LaunchingPlugin.log(e);
-		}
-		return entries.toArray(new String[0]);
-	}
-
-	/**
-	 * The name of the class that implements IProcessorInvoker
-	 */
-	public String getInvokerClassName()
-	{
-		return invokerClass;
-	}
-
-	public String getId()
-	{
-		return id;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorJar.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorJar.java
deleted file mode 100644
index 9d1c17b..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorJar.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.xsl.launching.IProcessorJar;
-
-public class ProcessorJar implements IProcessorJar
-{
-	private final IPath path;
-
-	public ProcessorJar(IPath path)
-	{
-		this.path = path;
-	}
-
-	public URL asURL()
-	{
-		URL url = null;
-		try
-		{
-			// first try to resolve as workspace-relative path
-			IPath rootPath = ResourcesPlugin.getWorkspace().getRoot().getLocation();
-			File file = new File(rootPath.append(path).toOSString());
-			if (file.exists())
-				url = file.toURL();
-			else
-			{
-				// now try to resolve as an absolute path
-				file = new File(path.toOSString());
-				url = file.toURL();
-			}
-		}
-		catch (MalformedURLException e)
-		{
-			LaunchingPlugin.log(e);
-		}
-		return url;
-	}
-
-	public IPath getPath()
-	{
-		return path;
-	}
-
-	@Override
-	public String toString()
-	{
-		return path.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorPreferences.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorPreferences.java
deleted file mode 100644
index 413d0ef..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorPreferences.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.IProcessorJar;
-import org.eclipse.wst.xsl.launching.ProcessorInstall;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-public class ProcessorPreferences
-{
-	private String defaultProcessorId;
-	private List<IProcessorInstall> processors = new ArrayList<IProcessorInstall>();
-
-	public void setProcessors(List<IProcessorInstall> processors)
-	{
-		this.processors = processors;
-	}
-
-	public List<IProcessorInstall> getProcessors()
-	{
-		return processors;
-	}
-
-	public String getDefaultProcessorId()
-	{
-		return defaultProcessorId;
-	}
-
-	public void setDefaultProcessorId(String defaultProcessorId)
-	{
-		this.defaultProcessorId = defaultProcessorId;
-	}
-
-	public String getAsXML() throws ParserConfigurationException, IOException, TransformerException
-	{
-		Document doc = PreferenceUtil.getDocument();
-		Element config = doc.createElement("processorSettings");  //$NON-NLS-1$
-		doc.appendChild(config);
-
-		// Set the defaultVM attribute on the top-level node
-		if (defaultProcessorId != null)
-		{
-			config.setAttribute("defaultProcessor", defaultProcessorId);  //$NON-NLS-1$
-		}
-
-		for (Iterator<IProcessorInstall> iter = processors.iterator(); iter.hasNext();)
-		{
-			IProcessorInstall install = (IProcessorInstall) iter.next();
-			if (!install.isContributed())
-			{
-				Element vmTypeElement = installAsElement(doc, install);
-				config.appendChild(vmTypeElement);
-			}
-		}
-
-		// Serialize the Document and return the resulting String
-		return PreferenceUtil.serializeDocument(doc);
-	}
-
-	public static ProcessorPreferences fromXML(InputStream inputStream) throws CoreException
-	{
-		ProcessorPreferences prefs = new ProcessorPreferences();
-
-		Document doc = PreferenceUtil.getDocument(inputStream);
-		Element config = doc.getDocumentElement();
-
-		// Populate the default VM-related fields
-		prefs.setDefaultProcessorId(config.getAttribute("defaultProcessor")); //$NON-NLS-1$
-
-		List<IProcessorInstall> processors = new ArrayList<IProcessorInstall>();
-		// Traverse the parsed structure and populate the VMType to VM Map
-		Element[] processorEls = PreferenceUtil.getChildElements(config, "processor"); //$NON-NLS-1$
-		for (int i = 0; i < processorEls.length; ++i)
-		{
-			IProcessorInstall processor = elementAsInstall(processorEls[i]);
-			processors.add(processor);
-		}
-
-		prefs.setProcessors(processors);
-
-		return prefs;
-	}
-
-	private static IProcessorInstall elementAsInstall(Element parent)
-	{
-		String id = parent.getAttribute("id"); //$NON-NLS-1$
-		String label = parent.getAttribute("label"); //$NON-NLS-1$
-		String typeId = parent.getAttribute("type"); //$NON-NLS-1$
-		String supports = parent.getAttribute("supports"); //$NON-NLS-1$
-		String debuggerId = parent.getAttribute("debuggerId"); //$NON-NLS-1$
-
-		IProcessorJar[] jars = null;
-		Element[] jarsEls = PreferenceUtil.getChildElements(parent, "jars"); //$NON-NLS-1$
-		if (jarsEls.length == 1)
-		{
-			jars = elementAsJars(jarsEls[0]);
-		}
-		IProcessorInstall install = new ProcessorInstall(id, label, typeId, jars, debuggerId, supports, false);
-		return install;
-	}
-
-	private static Element installAsElement(Document doc, IProcessorInstall install)
-	{
-		Element element = doc.createElement("processor"); //$NON-NLS-1$
-		element.setAttribute("id", install.getId()); //$NON-NLS-1$
-		element.setAttribute("label", install.getName()); //$NON-NLS-1$
-		element.setAttribute("type", install.getProcessorType().getId()); //$NON-NLS-1$
-		element.setAttribute("supports", install.getSupports()); //$NON-NLS-1$
-		element.setAttribute("debuggerId", install.getDebugger() != null ? install.getDebugger().getId() : null); //$NON-NLS-1$
-		element.appendChild(jarsAsElement(doc, install.getProcessorJars()));
-		return element;
-	}
-
-	private static IProcessorJar[] elementAsJars(Element element)
-	{
-		Element[] jarEls = PreferenceUtil.getChildElements(element, "jar"); //$NON-NLS-1$
-		List<ProcessorJar> jars = new ArrayList<ProcessorJar>(jarEls.length);
-		for (Element jarEl : jarEls)
-		{
-			Node node = jarEl.getFirstChild();
-			if (node != null && node.getNodeType() == Node.TEXT_NODE)
-			{
-				String path = ((Text) node).getNodeValue();
-				jars.add(new ProcessorJar(Path.fromPortableString(path)));
-			}
-		}
-		return (IProcessorJar[]) jars.toArray(new IProcessorJar[0]);
-	}
-
-	private static Element jarsAsElement(Document doc, IProcessorJar[] jars)
-	{
-		Element jarsEl = doc.createElement("jars");  //$NON-NLS-1$
-		for (IProcessorJar jar : jars)
-		{
-			if (jar != null && jar.getPath() != null)
-			{
-				Element jarEl = doc.createElement("jar"); //$NON-NLS-1$
-				Text text = doc.createTextNode(jar.getPath().toPortableString());
-				jarEl.appendChild(text);
-				jarsEl.appendChild(jarEl);
-			}
-		}
-		return jarsEl;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorType.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorType.java
deleted file mode 100644
index 6f289bd..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/ProcessorType.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.xsl.launching.IFeature;
-import org.eclipse.wst.xsl.launching.IOutputProperty;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class ProcessorType implements IProcessorType
-{
-	private static final String DESC_SUFFIX = ".DESC"; //$NON-NLS-1$
-	private static final String TYPE_SUFFIX = ".TYPE"; //$NON-NLS-1$
-
-	private final String id;
-	private final String name;
-	private final String transFactoryName;
-	private final URL featurePropertiesURL;
-	private final URL outputPropertiesURL;
-
-	private IFeature[] features;
-	private IOutputProperty[] outputProperties;
-	private Properties outputPropertyValues;
-	private Map<String, String> featureValues;
-
-	public ProcessorType(String id, String name, URL featurePropertiesURL, URL outputPropertiesURL, Map<String, String> featureValues, Properties outputPropertyValues, String transFactoryName)
-	{
-		this.id = id;
-		this.name = name;
-		this.featurePropertiesURL = featurePropertiesURL;
-		this.outputPropertiesURL = outputPropertiesURL;
-		this.featureValues = featureValues;
-		this.transFactoryName = transFactoryName;
-		this.outputPropertyValues = outputPropertyValues;
-	}
-
-	public String getId()
-	{
-		return id;
-	}
-
-	public String getLabel()
-	{
-		return name;
-	}
-
-	public Map<String, String> getFeatureValues()
-	{
-		return featureValues;
-	}
-
-	public IFeature[] getFeatures()
-	{
-		if (features == null)
-		{
-			if (featurePropertiesURL != null)
-				features = loadFeatures();
-			else
-				features = new IFeature[0];
-		}
-		return features;
-	}
-
-	public Properties getOutputPropertyValues()
-	{
-		return outputPropertyValues;
-	}
-
-	public boolean isJREDefault()
-	{
-		return XSLTRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID.equals(id);
-	}
-
-	public String getTransformerFactoryName()
-	{
-		return transFactoryName;
-	}
-
-	public IOutputProperty[] getOutputProperties()
-	{
-		if (outputProperties == null)
-		{
-			if (outputPropertiesURL != null)
-				outputProperties = loadOutputProperties();
-			else
-				outputProperties = new IOutputProperty[0];
-		}
-		return outputProperties;
-	}
-
-	private IOutputProperty[] loadOutputProperties()
-	{
-		BufferedInputStream is = null;
-		List<OutputProperty> outputs = new ArrayList<OutputProperty>();
-		Properties props = new Properties();
-		try
-		{
-
-			is = new BufferedInputStream(outputPropertiesURL.openStream());
-			props.load(is);
-			for (Object element : props.keySet())
-			{
-				String key = (String) element;
-				if (!key.endsWith(DESC_SUFFIX))
-				{
-					String name = key;
-					String uri = props.getProperty(key);
-					String desc = props.getProperty(key + DESC_SUFFIX);
-					if (uri != null && name != null && desc != null)
-					{
-						OutputProperty prop = new OutputProperty(uri.trim(), desc);
-						outputs.add(prop);
-					}
-					else
-					{
-						LaunchingPlugin.log(new CoreException(new Status(IStatus.WARNING, LaunchingPlugin.PLUGIN_ID, Messages.getString("ProcessorType.2") + outputPropertiesURL //$NON-NLS-1$
-								+ Messages.getString("ProcessorType.3") + key))); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-		catch (IOException e)
-		{
-			LaunchingPlugin.log(e);
-		}
-		finally
-		{
-			if (is != null)
-			{
-				try
-				{
-					is.close();
-				}
-				catch (IOException e)
-				{
-					LaunchingPlugin.log(e);
-				}
-			}
-		}
-		return (IOutputProperty[]) outputs.toArray(new IOutputProperty[0]);
-	}
-
-	private IFeature[] loadFeatures()
-	{
-		BufferedInputStream is = null;
-		List<Feature> featuresList = new ArrayList<Feature>();
-		try
-		{
-			is = new BufferedInputStream(featurePropertiesURL.openStream());
-			Properties props = new Properties();
-			props.load(is);
-
-			for (Object element : props.keySet())
-			{
-				String key = (String) element;
-				if (!key.endsWith(DESC_SUFFIX) && !key.endsWith(TYPE_SUFFIX))
-				{
-					String uri = props.getProperty(key);
-					String type = props.getProperty(key + TYPE_SUFFIX);
-					String desc = props.getProperty(key + DESC_SUFFIX);
-					if (uri != null && type != null && desc != null)
-					{
-						Feature feature = new Feature(uri.trim(), type.trim(), desc);
-						featuresList.add(feature);
-					}
-					else
-					{
-						LaunchingPlugin.log(new CoreException(new Status(IStatus.WARNING, LaunchingPlugin.PLUGIN_ID, Messages.getString("ProcessorType.4") + featurePropertiesURL //$NON-NLS-1$
-								+ Messages.getString("ProcessorType.5") + key))); //$NON-NLS-1$
-					}
-				}
-			}
-
-		}
-		catch (IOException e)
-		{
-			LaunchingPlugin.log(e);
-		}
-		finally
-		{
-			if (is != null)
-			{
-				try
-				{
-					is.close();
-				}
-				catch (IOException e)
-				{
-					LaunchingPlugin.log(e);
-				}
-			}
-		}
-		IFeature[] features = (IFeature[]) featuresList.toArray(new IFeature[0]);
-		Arrays.sort(features);
-		return features;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/Utils.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/Utils.java
deleted file mode 100644
index 11c649a..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/Utils.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-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.Platform;
-import org.eclipse.core.runtime.Status;
-
-public class Utils
-{
-
-	public static String getFileLocation(String bundleId, String path) throws CoreException
-	{
-		String location = null;
-		try
-		{
-			URL url = FileLocator.find(Platform.getBundle(bundleId), new Path(path), null);
-			if (url != null)
-			{
-				URL fileUrl = FileLocator.toFileURL(url);
-				File file = new File(fileUrl.getFile());
-				location = file.getAbsolutePath();
-			}
-		}
-		catch (IOException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.ERROR, Messages.getString("Utils.0") + path + Messages.getString("Utils.1") + bundleId, e)); //$NON-NLS-1$ //$NON-NLS-2$
-		} 
-		return location;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLPropertyTester.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLPropertyTester.java
deleted file mode 100644
index 12dd6b3..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLPropertyTester.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import org.eclipse.core.expressions.PropertyTester;
-
-public class XSLPropertyTester extends PropertyTester
-{
-	public boolean test(Object arg0, String arg1, Object[] arg2, Object arg3)
-	{
-		return true;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTLaunchConfigurationDelegate.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTLaunchConfigurationDelegate.java
deleted file mode 100644
index d078c44..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,463 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.DebugEvent;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IBreakpointManager;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.ISourceLocator;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.JavaLaunchDelegate;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.xsl.launching.IDebugger;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.IProcessorInvoker;
-import org.eclipse.wst.xsl.launching.IProcessorJar;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-import org.eclipse.wst.xsl.launching.config.LaunchHelper;
-import org.eclipse.wst.xsl.launching.model.IXSLConstants;
-import org.eclipse.wst.xsl.launching.model.XSLDebugTarget;
-
-public class XSLTLaunchConfigurationDelegate extends JavaLaunchDelegate implements IDebugEventSetListener
-{
-	private String mode;
-	private LaunchHelper launchHelper;
-	
-	private class XSLDebugEventSetListener implements IDebugEventSetListener
-	{
-		private ILaunch launch;
-
-		public XSLDebugEventSetListener(ILaunch launch)
-		{
-			this.launch = launch;
-		}
-		
-		public void handleDebugEvents(DebugEvent[] events)
-		{
-			if (launch.getProcesses().length > 0)
-			{
-				for (DebugEvent debugEvent : events)
-				{
-					if (debugEvent.getSource() == launch.getProcesses()[0] && debugEvent.getKind() == DebugEvent.TERMINATE)
-					{
-						// remove self as listener
-						DebugPlugin.getDefault().removeDebugEventListener(this);
-						File file = launchHelper.getTarget();
-						IFile ifile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(file.getAbsolutePath()));
-						if (ifile != null)
-						{// refresh this workspace file..
-							try
-							{
-								ifile.refreshLocal(IResource.DEPTH_ZERO, new NullProgressMonitor(){
-									@Override
-									public void done()
-									{
-										openFileIfRequired();
-									}
-								});
-							}
-							catch (CoreException e)
-							{
-								LaunchingPlugin.log(e);
-							}
-						}
-						else
-						{
-							openFileIfRequired();
-						}
-					}
-				}
-			}
-		}
-
-		private void openFileIfRequired()
-		{
-			// TODO this is dirty - need to declare extension point and move the UI code into the UI plugin
-			if (launchHelper.getOpenFileOnCompletion())
-			{
-				PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable()
-				{
-					public void run()
-					{
-						// Open editor on new file.
-						IWorkbenchWindow dw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-						try
-						{
-							File file = launchHelper.getTarget();
-							Path path = new Path(file.getAbsolutePath());
-							IFileStore filestore = EFS.getLocalFileSystem().getStore(path);
-							IDE.openEditorOnFileStore(dw.getActivePage(), filestore);
-						}
-						catch (PartInitException e)
-						{
-							LaunchingPlugin.log(e);
-						}
-					}
-				});
-			}
-		}
-	}
-
-	@Override
-	public synchronized void launch(ILaunchConfiguration configuration, final String mode, final ILaunch launch, IProgressMonitor monitor) throws CoreException
-	{
-		this.mode = mode;
-		launchHelper = new LaunchHelper(configuration);
-		launchHelper.save(getLaunchConfigFile());
-		DebugPlugin.getDefault().addDebugEventListener(new XSLDebugEventSetListener(launch));
-
-		// the super.launch will add a Java source director if we set it to null here
-		final ISourceLocator configuredLocator = launch.getSourceLocator();
-		launch.setSourceLocator(null);
-
-		super.launch(configuration, mode, launch, monitor);
-		
-		// now get the java source locator
-		final ISourceLocator javaSourceLookupDirector = (ISourceLocator)launch.getSourceLocator();
-		// now add our own participant to the java director
-		launch.setSourceLocator(new ISourceLocator(){
-
-			public Object getSourceElement(IStackFrame stackFrame) 
-			{
-				// simply look at one and then the other
-				Object sourceElement = javaSourceLookupDirector.getSourceElement(stackFrame);
-				if (sourceElement == null)
-					sourceElement = configuredLocator.getSourceElement(stackFrame);
-				return sourceElement;
-			}});
-		
-//		IJavaDebugTarget javaTarget = (IJavaDebugTarget)launch.getDebugTarget();
-//		launch.removeDebugTarget(javaTarget);
-		
-		IDebugTarget javaTarget = launch.getDebugTarget();
-		IDebugTarget xslTarget = new XSLDebugTarget(launch, launch.getProcesses()[0], launchHelper);
-		
-		// remove java as the primary target and make xsl the primary target
-		launch.removeDebugTarget(javaTarget);
-		launch.addDebugTarget(xslTarget);
-		// add this here to make java the non-primary target
-	//	launch.addDebugTarget(javaTarget);
-		
-	//	launch.addDebugTarget(new JavaXSLDebugTarget(launch, launch.getProcesses()[0], launchHelper, javaTarget));
-	}
-
-	/**
-	 * Get the Java breakpoint and the XSL breakpoints
-	 */
-	@Override
-	protected IBreakpoint[] getBreakpoints(ILaunchConfiguration configuration)
-	{
-		IBreakpointManager breakpointManager = DebugPlugin.getDefault().getBreakpointManager();
-		if (!breakpointManager.isEnabled())
-			return null;
-		
-		IBreakpoint[] javaBreakpoints = super.getBreakpoints(configuration);
-		IBreakpoint[] xslBreakpoints = breakpointManager.getBreakpoints(IXSLConstants.ID_XSL_DEBUG_MODEL);
-		IBreakpoint[] breakpoints = new IBreakpoint[javaBreakpoints.length+xslBreakpoints.length];
-		System.arraycopy(javaBreakpoints, 0, breakpoints, 0, javaBreakpoints.length);
-		System.arraycopy(xslBreakpoints, 0, breakpoints, javaBreakpoints.length, xslBreakpoints.length);
-		
-		return breakpoints;
-	}
-
-	@Override
-	public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException
-	{
-		if (mode.equals(ILaunchManager.DEBUG_MODE))
-		{
-			final IProcessorInstall install = getProcessorInstall(configuration, ILaunchManager.RUN_MODE);
-			if (install.getDebugger() == null)
-			{
-				final boolean[] result = new boolean[]
-				{ false };
-				// open a dialog for choosing a different install that does have
-				// an associated debugger
-				PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable()
-				{
-					public void run()
-					{
-						String debuggingInstallId = LaunchingPlugin.getDefault().getPluginPreferences().getString(XSLLaunchConfigurationConstants.ATTR_DEFAULT_DEBUGGING_INSTALL_ID);
-						IProcessorInstall processor = XSLTRuntime.getProcessor(debuggingInstallId);
-
-						IWorkbenchWindow dw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-						result[0] = MessageDialog.openQuestion(dw.getShell(), Messages.getString("XSLTLaunchConfigurationDelegate.0"), Messages.getString("XSLTLaunchConfigurationDelegate.1") + install.getName() + Messages.getString("XSLTLaunchConfigurationDelegate.2") //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-								+ Messages.getString("XSLTLaunchConfigurationDelegate.3") + processor.getName() + Messages.getString("XSLTLaunchConfigurationDelegate.4")); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				});
-				return result[0];
-			}
-		}
-		return super.preLaunchCheck(configuration, mode, monitor);
-	}
-
-	@Override
-	public IVMRunner getVMRunner(ILaunchConfiguration configuration, String mode) throws CoreException
-	{
-		// comment this out in order to get java debugging as well as XSL debugging
-//		if (ILaunchManager.DEBUG_MODE.equals(mode))
-//			return super.getVMRunner(configuration, ILaunchManager.RUN_MODE);
-		return super.getVMRunner(configuration, mode);
-	}
-
-	private File getLaunchConfigFile()
-	{
-		IPath launchPath = Platform.getStateLocation(LaunchingPlugin.getDefault().getBundle()).append(Messages.getString("XSLTLaunchConfigurationDelegate.5")); //$NON-NLS-1$
-		File launchDir = launchPath.toFile();
-		if (!launchDir.exists())
-			launchDir.mkdir();
-		File featuresFile = new File(launchDir, Messages.getString("XSLTLaunchConfigurationDelegate.6")); //$NON-NLS-1$
-		return featuresFile;
-	}
-
-	@Override
-	public IPath getWorkingDirectoryPath(ILaunchConfiguration configuration) throws CoreException
-	{
-		String path = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PROCESSOR_WORKING_DIR, (String) null);
-		if (path != null)
-		{
-			path = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(path);
-			return new Path(path);
-		}
-		return null;
-	}
-
-	private IProcessorInvoker getProcessorInvokerDescriptor(ILaunchConfiguration configuration) throws CoreException
-	{
-		String invokerId = configuration.getAttribute(XSLLaunchConfigurationConstants.INVOKER_DESCRIPTOR, (String) null);
-		if (invokerId == null)
-			invokerId = "org.eclipse.wst.xsl.launching.jaxp.invoke"; //$NON-NLS-1$
-		return XSLTRuntime.getProcessorInvoker(invokerId);
-	}
-
-	public static IProcessorInstall getProcessorInstall(ILaunchConfiguration configuration, String mode) throws CoreException
-	{
-		IProcessorInstall install;
-		boolean useDefaultProcessor = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, true);
-		if (useDefaultProcessor)
-		{
-			install = XSLTRuntime.getDefaultProcessor();
-		}
-		else
-		{
-			String processorId = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PROCESSOR, ""); //$NON-NLS-1$
-			install = XSLTRuntime.getProcessor(processorId);
-		}
-		if (mode.equals(ILaunchManager.DEBUG_MODE) && install.getDebugger() == null)
-		{
-			String debuggingInstallId = LaunchingPlugin.getDefault().getPluginPreferences().getString(XSLLaunchConfigurationConstants.ATTR_DEFAULT_DEBUGGING_INSTALL_ID);
-			install = XSLTRuntime.getProcessor(debuggingInstallId);
-		}
-		return install;
-	}
-
-	@Override
-	public String getMainTypeName(ILaunchConfiguration configuration) throws CoreException
-	{
-		if (ILaunchManager.DEBUG_MODE.equals(mode))
-			return "org.eclipse.wst.xsl.debugger.DebugRunner"; //$NON-NLS-1$
-		return "org.eclipse.wst.xsl.invoker.Main"; //$NON-NLS-1$
-	}
-
-	@Override
-	public String getProgramArguments(ILaunchConfiguration configuration) throws CoreException
-	{
-		// classname, sourceurl, output file
-		IProcessorInvoker invoker = getProcessorInvokerDescriptor(configuration);
-		String clazz = invoker.getInvokerClassName();
-
-		StringBuffer sb = new StringBuffer();
-		sb.append(clazz);
-		sb.append(" "); //$NON-NLS-1$
-		sb.append("\"" + getLaunchConfigFile().getAbsolutePath() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-		sb.append(" "); //$NON-NLS-1$
-		sb.append("\"" + launchHelper.getSource() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-		sb.append(" "); //$NON-NLS-1$
-		sb.append("\"" + launchHelper.getTarget().getAbsolutePath() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-		if (ILaunchManager.DEBUG_MODE.equals(mode))
-		{
-			IProcessorInstall install = getProcessorInstall(configuration, mode);
-			if (install.getDebugger() != null)
-			{
-				IDebugger debugger = install.getDebugger();
-				String className = debugger.getClassName();
-				sb.append(" -debug ").append(className).append(" "); //$NON-NLS-1$ //$NON-NLS-2$
-				sb.append(launchHelper.getRequestPort()).append(" ").append(launchHelper.getEventPort()); //$NON-NLS-1$
-			}
-		}
-
-		return sb.toString();
-	}
-
-	@Override
-	public String[] getClasspath(ILaunchConfiguration configuration) throws CoreException
-	{
-		// get the classpath defined by the user
-		String[] userClasspath = super.getClasspath(configuration);
-
-		// get the classpath required for the transformation
-		IProcessorInvoker invoker = getProcessorInvokerDescriptor(configuration);
-		List<String> invokerCP = new ArrayList<String>();
-		for (String entry : invoker.getClasspathEntries())
-		{
-			invokerCP.add(entry);
-		}
-
-		// add the debugger...
-		IProcessorInstall install = getProcessorInstall(configuration, mode);
-		if (ILaunchManager.DEBUG_MODE.equals(mode) && install.getDebugger() != null)
-		{
-			String[] jars = install.getDebugger().getClassPath();
-			for (String jar : jars)
-			{
-				invokerCP.add(jar);
-			}
-		}
-
-		String[] invokerClasspath = (String[]) invokerCP.toArray(new String[0]);
-
-		// add them together
-		String[] classpath = new String[userClasspath.length + invokerClasspath.length];
-		System.arraycopy(invokerClasspath, 0, classpath, 0, invokerClasspath.length);
-		System.arraycopy(userClasspath, 0, classpath, invokerClasspath.length, userClasspath.length);
-
-		return classpath;
-	}
-
-	@Override
-	public String getVMArguments(ILaunchConfiguration configuration) throws CoreException
-	{
-		String vmargs = super.getVMArguments(configuration);
-
-		IProcessorInstall install = getProcessorInstall(configuration, mode);
-		if (install != null && !install.getProcessorType().isJREDefault())
-		{
-			// clear the endorsed dir
-			File tempDir = getEndorsedDir();
-			if (tempDir.exists())
-			{
-				File[] children = tempDir.listFiles();
-				for (File child : children)
-				{
-					child.delete();
-				}
-				tempDir.delete();
-			}
-			tempDir.mkdir();
-
-			// move the required jars to the endorsed dir
-			IProcessorJar[] jars = install.getProcessorJars();
-			for (int i = 0; i < jars.length; i++)
-			{
-				URL entry = jars[i].asURL();
-				if (entry == null)
-					throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.ERROR, Messages.getString("XSLTLaunchConfigurationDelegate.23") + jars[i], null)); //$NON-NLS-1$
-				File file = new File(tempDir, "END_" + i + ".jar"); //$NON-NLS-1$ //$NON-NLS-2$
-				moveFile(entry, file);
-			}
-			// add the endorsed dir
-			vmargs += " -Djava.endorsed.dirs=\"" + tempDir.getAbsolutePath() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-			String tfactory = install.getProcessorType().getTransformerFactoryName();
-			if (tfactory != null)
-				vmargs += " -Djavax.xml.transform.TransformerFactory=" + install.getProcessorType().getTransformerFactoryName(); //$NON-NLS-1$
-		}
-		return vmargs;
-	}
-
-	private File getEndorsedDir()
-	{
-		IPath tempLocation = Platform.getStateLocation(LaunchingPlugin.getDefault().getBundle()).append("endorsed"); //$NON-NLS-1$
-		return tempLocation.toFile();
-	}
-
-	private static void moveFile(URL src, File target) throws CoreException
-	{
-		BufferedOutputStream bos = null;
-		BufferedInputStream bis = null;
-		try
-		{
-			bos = new BufferedOutputStream(new FileOutputStream(target));
-			bis = new BufferedInputStream(src.openStream());
-			while (bis.available() > 0)
-			{
-				int size = bis.available();
-				if (size > 1024)
-					size = 1024;
-				byte[] b = new byte[size];
-				bis.read(b, 0, b.length);
-				bos.write(b);
-			}
-		}
-		catch (IOException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.ERROR, Messages.getString("XSLTLaunchConfigurationDelegate.7") + src + Messages.getString("XSLTLaunchConfigurationDelegate.31") + target, e)); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		finally
-		{
-			if (bis != null)
-			{
-				try
-				{
-					bis.close();
-				}
-				catch (IOException e)
-				{
-					LaunchingPlugin.log(e);
-				}
-			}
-			if (bos != null)
-			{
-				try
-				{
-					bos.close();
-				}
-				catch (IOException e)
-				{
-					LaunchingPlugin.log(e);
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTSourceLookupDirector.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTSourceLookupDirector.java
deleted file mode 100644
index ea3e73c..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTSourceLookupDirector.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupDirector;
-import org.eclipse.debug.core.sourcelookup.ISourceLookupParticipant;
-
-public class XSLTSourceLookupDirector extends AbstractSourceLookupDirector
-{
-	public void initializeParticipants()
-	{
-		addParticipants(new ISourceLookupParticipant[]{ new XSLTSourceLookupParticipant() });
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTSourceLookupParticipant.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTSourceLookupParticipant.java
deleted file mode 100644
index 2e23289..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTSourceLookupParticipant.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.sourcelookup.AbstractSourceLookupParticipant;
-import org.eclipse.wst.xsl.launching.model.XSLStackFrame;
-
-/**
- * Translate a stack frame into a source file name
- */
-public class XSLTSourceLookupParticipant extends AbstractSourceLookupParticipant
-{
-	public String getSourceName(Object object) throws CoreException
-	{
-		if (object instanceof XSLStackFrame)
-		{
-			return ((XSLStackFrame) object).getSourceName();
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTSourcePathComputerDelegate.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTSourcePathComputerDelegate.java
deleted file mode 100644
index ffeb698..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/XSLTSourcePathComputerDelegate.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-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.core.variables.VariablesPlugin;
-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.DirectorySourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.FolderSourceContainer;
-import org.eclipse.debug.core.sourcelookup.containers.ProjectSourceContainer;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.config.LaunchPipeline;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-
-public class XSLTSourcePathComputerDelegate implements ISourcePathComputerDelegate
-{
-	public ISourceContainer[] computeSourceContainers(ILaunchConfiguration configuration, IProgressMonitor monitor) throws CoreException
-	{
-		List<ISourceContainer> containers = new ArrayList<ISourceContainer>();
-
-		String sourceFileExpr = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, (String) null);
-		IPath sourceFile = getSubstitutedPath(sourceFileExpr);
-		LaunchPipeline pipeline = hydratePipeline(configuration);
-
-		// TODO have some way of knowing whether it is an IResource or not
-		containers.add(new DirectorySourceContainer(sourceFile, false));
-
-		for (Iterator<?> iter = pipeline.getTransformDefs().iterator(); iter.hasNext();)
-		{
-			LaunchTransform transform = (LaunchTransform) iter.next();
-			IPath path = transform.getPath();
-			ISourceContainer sourceContainer = null;
-			if (transform.getPathType().equals(LaunchTransform.RESOURCE_TYPE))
-			{
-				IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
-				IContainer container = resource.getParent();
-				if (container.getType() == IResource.PROJECT)
-				{
-					sourceContainer = new ProjectSourceContainer((IProject) container, false);
-				}
-				else if (container.getType() == IResource.FOLDER)
-				{
-					sourceContainer = new FolderSourceContainer(container, false);
-				}
-			}
-			else
-			{
-				sourceContainer = new DirectorySourceContainer(path, false);
-			}
-			containers.add(sourceContainer);
-		}
-
-		// if (sourceContainer == null)
-		// {
-		// sourceContainer = new WorkspaceSourceContainer();
-		// }
-
-		return (ISourceContainer[]) containers.toArray(new ISourceContainer[0]);
-	}
-
-	private static LaunchPipeline hydratePipeline(ILaunchConfiguration configuration) throws CoreException
-	{
-		LaunchPipeline pipeline = null;
-		String s = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PIPELINE, (String) null);
-		if (s != null && s.length() > 0)
-		{
-			ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes());
-			pipeline = LaunchPipeline.fromXML(inputStream);
-		}
-		return pipeline;
-	}
-
-	private static IPath getSubstitutedPath(String path) throws CoreException
-	{
-		if (path != null)
-		{
-			path = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(path);
-			return new Path(path);
-		}
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/messages.properties b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/messages.properties
deleted file mode 100644
index ff3cdbd..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/messages.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-Feature.0=Value must be a double
-Feature.1=Value must be an integer
-Feature.2=Valid values are 'true' or 'false'
-Feature.5=Value must be a float
-PluginProcessorJar.0=, path 
-ProcessorType.2=Output properties file 
-ProcessorType.3=\ not configured properly for key 
-ProcessorType.4=Feature properties file 
-ProcessorType.5=\ not configured properly for key 
-Utils.0=Error determining jar file location: 
-Utils.1=\ from bundle: 
-XSLTLaunchConfigurationDelegate.0=XSLT Processor Debugger
-XSLTLaunchConfigurationDelegate.1=The 
-XSLTLaunchConfigurationDelegate.2=\ XSLT processor does not support debugging.\n
-XSLTLaunchConfigurationDelegate.23=Could not locate jar file 
-XSLTLaunchConfigurationDelegate.3=Would you like to debug using the default 
-XSLTLaunchConfigurationDelegate.31=\ to 
-XSLTLaunchConfigurationDelegate.4=\ processor instead?
-XSLTLaunchConfigurationDelegate.5=launch
-XSLTLaunchConfigurationDelegate.6=launch.xml
-XSLTLaunchConfigurationDelegate.7=Error copying url 
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/AbstractRegistryReader.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/AbstractRegistryReader.java
deleted file mode 100644
index d799c57..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/AbstractRegistryReader.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching.registry;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-
-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.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-
-public abstract class AbstractRegistryReader
-{
-	public static final String ATT_CLASS = "class"; //$NON-NLS-1$
-	public static final String TAG_DESCRIPTION = "description"; //$NON-NLS-1$
-
-	protected static void logError(IConfigurationElement element, String text)
-	{
-		IExtension extension = element.getDeclaringExtension();
-		StringBuffer buf = new StringBuffer();
-		buf.append("Plugin " + extension.getNamespaceIdentifier() + Messages.getString("AbstractRegistryReader.3") + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$
-		buf.append("\n" + text); //$NON-NLS-1$
-		LaunchingPlugin.log(new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.OK, buf.toString(), null)));
-	}
-
-	protected static void logMissingAttribute(IConfigurationElement element, String attributeName)
-	{
-		logError(element, Messages.getString("AbstractRegistryReader.5") + attributeName + Messages.getString("AbstractRegistryReader.6")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	protected static void logMissingElement(IConfigurationElement element, String elementName)
-	{
-		logError(element, Messages.getString("AbstractRegistryReader.7") + elementName + Messages.getString("AbstractRegistryReader.8")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	protected static void logUnknownElement(IConfigurationElement element)
-	{
-		logError(element, Messages.getString("AbstractRegistryReader.9") + element.getName()); //$NON-NLS-1$
-	}
-
-	public static IExtension[] orderExtensions(IExtension[] extensions)
-	{
-		IExtension[] sortedExtension = new IExtension[extensions.length];
-		System.arraycopy(extensions, 0, sortedExtension, 0, extensions.length);
-		Comparator<IExtension> comparer = new Comparator<IExtension>()
-		{
-			public int compare(IExtension arg0, IExtension arg1)
-			{
-				String s1 = arg0.getNamespaceIdentifier();
-				String s2 = arg1.getNamespaceIdentifier();
-				return s1.compareToIgnoreCase(s2);
-			}
-		};
-		Collections.sort(Arrays.asList(sortedExtension), comparer);
-		return sortedExtension;
-	}
-
-	protected abstract boolean readElement(IConfigurationElement element);
-
-	protected void readElementChildren(IConfigurationElement element)
-	{
-		readElements(element.getChildren());
-	}
-
-	protected void readElements(IConfigurationElement[] elements)
-	{
-		for (int i = 0; i < elements.length; i++)
-		{
-			if (!readElement(elements[i]))
-				logUnknownElement(elements[i]);
-		}
-	}
-
-	protected void readExtension(IExtension extension)
-	{
-		readElements(extension.getConfigurationElements());
-	}
-
-	public void readRegistry(IExtensionRegistry registry, String pluginId, String extensionPoint)
-	{
-		IExtensionPoint point = registry.getExtensionPoint(pluginId, extensionPoint);
-		if (point == null)
-			return;
-		IExtension[] extensions = point.getExtensions();
-		extensions = orderExtensions(extensions);
-		for (IExtension element : extensions)
-			readExtension(element);
-	}
-
-	public static String getDescription(IConfigurationElement configElement)
-	{
-		IConfigurationElement[] children = configElement.getChildren(TAG_DESCRIPTION);
-		if (children.length >= 1)
-		{
-			return children[0].getValue();
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public static String getClassValue(IConfigurationElement configElement, String classAttributeName)
-	{
-		String className = configElement.getAttribute(classAttributeName);
-		if (className != null)
-			return className;
-		IConfigurationElement[] candidateChildren = configElement.getChildren(classAttributeName);
-		if (candidateChildren.length == 0)
-			return null;
-
-		return candidateChildren[0].getAttribute(ATT_CLASS);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/DebuggerRegistry.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/DebuggerRegistry.java
deleted file mode 100644
index e8aaedc..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/DebuggerRegistry.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching.registry;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.xsl.internal.launching.DebuggerDescriptor;
-import org.eclipse.wst.xsl.launching.IDebugger;
-
-public class DebuggerRegistry
-{
-	private final Map<String, DebuggerDescriptor> debuggers = new HashMap<String, DebuggerDescriptor>();
-
-	public DebuggerRegistry()
-	{
-		DebuggerRegistryReader registryReader = new DebuggerRegistryReader();
-		registryReader.addConfigs(this);
-	}
-
-	public IDebugger getDebugger(String id)
-	{
-		return (IDebugger) debuggers.get(id);
-	}
-
-	public IDebugger[] getDebuggers()
-	{
-		return (IDebugger[]) debuggers.values().toArray(new IDebugger[0]);
-	}
-
-	public void addDebugger(DebuggerDescriptor desc)
-	{
-		debuggers.put(desc.getId(), desc);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/DebuggerRegistryReader.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/DebuggerRegistryReader.java
deleted file mode 100644
index b5da573..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/DebuggerRegistryReader.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching.registry;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.internal.launching.DebuggerDescriptor;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-
-public class DebuggerRegistryReader extends AbstractRegistryReader
-{
-	public static final String TAG_DEBUGGER = "debugger"; //$NON-NLS-1$
-	public static final String ATT_ID = "id"; //$NON-NLS-1$
-	public static final String ATT_CLASSNAME = "className"; //$NON-NLS-1$
-	public static final String ATT_CLASSPATH = "classpath"; //$NON-NLS-1$
-	public static final String ATT_NAME = "name"; //$NON-NLS-1$
-	public static final String ATT_PROCESSOR_TYPE_ID = "processorTypeId"; //$NON-NLS-1$
-
-	private DebuggerRegistry registry;
-
-	@Override
-	protected boolean readElement(IConfigurationElement element)
-	{
-		if (!element.getName().equals(TAG_DEBUGGER))
-			return false;
-
-		String id = element.getAttribute(ATT_ID);
-		if (id == null)
-		{
-			logMissingAttribute(element, ATT_ID);
-			return true;
-		}
-
-		String className = element.getAttribute(ATT_CLASSNAME);
-		if (className == null)
-		{
-			logMissingAttribute(element, ATT_CLASSNAME);
-			return true;
-		}
-
-		String classpath = element.getAttribute(ATT_CLASSPATH);
-		if (classpath == null)
-		{
-			logMissingAttribute(element, ATT_CLASSPATH);
-			return true;
-		}
-
-		String[] entries = classpath.split(";"); //$NON-NLS-1$
-		for (int i = 0; i < entries.length; i++)
-		{
-			String string = entries[i];
-			entries[i] = string.trim();
-		}
-
-		String name = element.getAttribute(ATT_NAME);
-		if (name == null)
-		{
-			logMissingAttribute(element, ATT_NAME);
-			return true;
-		}
-
-		String processorTypeId = element.getAttribute(ATT_PROCESSOR_TYPE_ID);
-		if (processorTypeId == null)
-		{
-			logMissingAttribute(element, ATT_PROCESSOR_TYPE_ID);
-			return true;
-		}
-
-		registry.addDebugger(new DebuggerDescriptor(id, element.getContributor().getName(), className, entries, name, processorTypeId));
-
-		return true;
-	}
-
-	public void readElement(DebuggerRegistry registry, IConfigurationElement element)
-	{
-		this.registry = registry;
-		readElement(element);
-	}
-
-	public void addConfigs(DebuggerRegistry registry)
-	{
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		this.registry = registry;
-		readRegistry(extensionRegistry, LaunchingPlugin.PLUGIN_ID, "debugger"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/InvokerRegistry.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/InvokerRegistry.java
deleted file mode 100644
index 85bd7ea..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/InvokerRegistry.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching.registry;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.xsl.launching.IProcessorInvoker;
-
-public class InvokerRegistry
-{
-	private final Map<String, IProcessorInvoker> invokers = new HashMap<String, IProcessorInvoker>();
-
-	public InvokerRegistry()
-	{
-		InvokerRegistryReader registryReader = new InvokerRegistryReader();
-		registryReader.addConfigs(this);
-	}
-
-	public IProcessorInvoker getProcessorInvoker(String id)
-	{
-		return (IProcessorInvoker) invokers.get(id);
-	}
-
-	public IProcessorInvoker[] getProcessorInvokers()
-	{
-		return (IProcessorInvoker[]) invokers.values().toArray(new IProcessorInvoker[0]);
-	}
-
-	public void addInvokerDescriptor(IProcessorInvoker desc)
-	{
-		invokers.put(desc.getId(), desc);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/InvokerRegistryReader.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/InvokerRegistryReader.java
deleted file mode 100644
index 8a52471..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/InvokerRegistryReader.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching.registry;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-import org.eclipse.wst.xsl.internal.launching.ProcessorInvokerDescriptor;
-
-public class InvokerRegistryReader extends AbstractRegistryReader
-{
-	public static final String TAG_INVOKE = "invoker"; //$NON-NLS-1$
-	public static final String ATT_ID = "id"; //$NON-NLS-1$
-	public static final String ATT_CLASS = "class"; //$NON-NLS-1$
-	public static final String ATT_CLASSPATH = "classpath"; //$NON-NLS-1$
-
-	private InvokerRegistry registry;
-
-	@Override
-	protected boolean readElement(IConfigurationElement element)
-	{
-		if (!element.getName().equals(TAG_INVOKE))
-			return false;
-
-		String id = element.getAttribute(ATT_ID);
-		if (id == null)
-		{
-			logMissingAttribute(element, ATT_ID);
-			return true;
-		}
-
-		String classname = element.getAttribute(ATT_CLASS);
-		if (classname == null)
-		{
-			logMissingAttribute(element, ATT_CLASS);
-			return true;
-		}
-
-		String classpath = element.getAttribute(ATT_CLASSPATH);
-		if (classpath == null)
-		{
-			logMissingAttribute(element, ATT_CLASSPATH);
-			return true;
-		}
-
-		String[] entries = classpath.split(";"); //$NON-NLS-1$
-		for (int i = 0; i < entries.length; i++)
-		{
-			String string = entries[i];
-			entries[i] = string.trim();
-		}
-
-		registry.addInvokerDescriptor(new ProcessorInvokerDescriptor(id, element.getContributor().getName(), classname, entries));
-
-		return true;
-	}
-
-	public void readElement(InvokerRegistry registry, IConfigurationElement element)
-	{
-		this.registry = registry;
-		readElement(element);
-	}
-
-	public void addConfigs(InvokerRegistry registry)
-	{
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		this.registry = registry;
-		readRegistry(extensionRegistry, LaunchingPlugin.PLUGIN_ID, "invoke"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/Messages.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/Messages.java
deleted file mode 100644
index fb017f0..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.internal.launching.registry;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.internal.launching.registry.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/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorRegistry.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorRegistry.java
deleted file mode 100644
index 57a72a1..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorRegistry.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching.registry;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-import org.eclipse.wst.xsl.internal.launching.ProcessorPreferences;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.IProcessorJar;
-import org.eclipse.wst.xsl.launching.ProcessorInstall;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class ProcessorRegistry
-{
-	private final List<ProcessorInstall> contributedInstalls = new ArrayList<ProcessorInstall>();
-	private List<IProcessorInstall> userInstalls = new ArrayList<IProcessorInstall>();
-	private IProcessorInstall defaultProcessor;
-	private IProcessorInstall jreDefaultProcessor;
-	private IProcessorInstall[] installs;
-
-	public ProcessorRegistry()
-	{
-		initializeFromStorage();
-	}
-
-	private void initializeFromStorage()
-	{
-		// read from the registry
-		ProcessorRegistryReader registryReader = new ProcessorRegistryReader();
-		registryReader.addConfigs(this);
-		// find the jre default
-		for (Iterator<ProcessorInstall> iter = contributedInstalls.iterator(); iter.hasNext();)
-		{
-			IProcessorInstall install = (IProcessorInstall) iter.next();
-			if (install.getId().equals(XSLTRuntime.JRE_DEFAULT_PROCESSOR_ID))
-			{
-				jreDefaultProcessor = install;
-				break;
-			}
-		}
-		// read from the preferences
-		addPersistedVMs();
-	}
-
-	private void addPersistedVMs()
-	{
-		// Try retrieving the VM preferences from the preference store
-		String vmXMLString = LaunchingPlugin.getDefault().getPluginPreferences().getString(XSLTRuntime.PREF_PROCESSOR_XML);
-
-		// If the preference was found, load VMs from it into memory
-		if (vmXMLString.length() > 0)
-		{
-			try
-			{
-				ByteArrayInputStream inputStream = new ByteArrayInputStream(vmXMLString.getBytes());
-				ProcessorPreferences prefs = ProcessorPreferences.fromXML(inputStream);
-				String defaultProcessorId = prefs.getDefaultProcessorId();
-				userInstalls = prefs.getProcessors();
-				for (Iterator<IProcessorInstall> iter = userInstalls.iterator(); iter.hasNext();)
-				{
-					IProcessorInstall install = (IProcessorInstall) iter.next();
-					if (install.getId().equals(defaultProcessorId))
-					{
-						defaultProcessor = install;
-					}
-				}
-				if (defaultProcessor == null)
-				{
-					for (Iterator<ProcessorInstall> iter = contributedInstalls.iterator(); iter.hasNext();)
-					{
-						IProcessorInstall install = (IProcessorInstall) iter.next();
-						if (defaultProcessor == null && install.getId().equals(defaultProcessorId))
-						{
-							defaultProcessor = install;
-						}
-					}
-				}
-			}
-			catch (CoreException e)
-			{
-				LaunchingPlugin.log(e);
-			}
-		}
-		// make the JRE the default default
-		if (defaultProcessor == null)
-		{
-			defaultProcessor = jreDefaultProcessor;
-		}
-	}
-
-	public void addProcessor(String bundleId, String id, String label, String processorTypeId, String classpath, String debuggerId, String supports)
-	{
-		IProcessorJar[] jars = ProcessorInstall.createJars(bundleId, classpath);
-		contributedInstalls.add(new ProcessorInstall(id, label, processorTypeId, jars, debuggerId, supports, true));
-	}
-
-	public void addProcessor(IProcessorInstall install)
-	{
-		if (!install.isContributed())
-			userInstalls.add(install);
-		IProcessorInstall[] newinstalls = new IProcessorInstall[installs.length + 1];
-		System.arraycopy(installs, 0, newinstalls, 0, installs.length);
-		newinstalls[installs.length] = install;
-		installs = newinstalls;
-	}
-
-	public void removeProcessor(int index)
-	{
-		IProcessorInstall removed = installs[index];
-		if (!removed.isContributed())
-			userInstalls.remove(removed);
-		IProcessorInstall[] newinstalls = new IProcessorInstall[installs.length - 1];
-		System.arraycopy(installs, 0, newinstalls, 0, index);
-		System.arraycopy(installs, index + 1, newinstalls, index, newinstalls.length - index);
-		installs = newinstalls;
-	}
-
-	public IProcessorInstall[] getProcessors()
-	{
-		if (installs == null)
-		{
-			installs = new IProcessorInstall[contributedInstalls.size() + userInstalls.size()];
-			int startIndex = 0;
-			for (int i = 0; i < contributedInstalls.size(); i++)
-			{
-				installs[i] = (IProcessorInstall) contributedInstalls.get(i);
-				startIndex = i + 1;
-			}
-			for (int i = 0; i < userInstalls.size(); i++)
-			{
-				installs[startIndex + i] = (IProcessorInstall) userInstalls.get(i);
-			}
-		}
-		return installs;
-	}
-
-	public IProcessorInstall[] getProcessors(String id)
-	{
-		IProcessorInstall[] installs = getProcessors();
-		List<IProcessorInstall> result = new ArrayList<IProcessorInstall>();
-		for (IProcessorInstall type : installs)
-		{
-			if (type.getProcessorType().getId().equals(id))
-				result.add(type);
-		}
-		return (IProcessorInstall[]) result.toArray(new IProcessorInstall[0]);
-	}
-
-	public void setDefaultProcessor(IProcessorInstall defaultInstall)
-	{
-		defaultProcessor = defaultInstall;
-	}
-
-	public IProcessorInstall getDefaultProcessor()
-	{
-		return defaultProcessor;
-	}
-
-	public IProcessorInstall getJREDefaultProcessor()
-	{
-		return jreDefaultProcessor;
-	}
-
-	public IProcessorInstall[] getContributedProcessors()
-	{
-		return (IProcessorInstall[]) contributedInstalls.toArray(new IProcessorInstall[0]);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorRegistryReader.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorRegistryReader.java
deleted file mode 100644
index 7187571..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorRegistryReader.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching.registry;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-
-public class ProcessorRegistryReader extends AbstractRegistryReader
-{
-	public static final String TAG_processor = "processor"; //$NON-NLS-1$
-	public static final String ATT_ID = "id"; //$NON-NLS-1$
-	public static final String ATT_LABEL = "label"; //$NON-NLS-1$
-	public static final String ATT_TYPE_ID = "processorTypeId"; //$NON-NLS-1$
-	public static final String ATT_DEBUGGER_ID = "debuggerId"; //$NON-NLS-1$
-	public static final String ATT_CLASSPATH = "classpath"; //$NON-NLS-1$
-	public static final String ATT_SUPPORTS = "supports"; //$NON-NLS-1$
-
-	private ProcessorRegistry registry;
-
-	@Override
-	protected boolean readElement(IConfigurationElement element)
-	{
-		if (!element.getName().equals(TAG_processor))
-			return false;
-
-		String id = element.getAttribute(ATT_ID);
-		if (id == null)
-		{
-			logMissingAttribute(element, ATT_ID);
-			return true;
-		}
-
-		String label = element.getAttribute(ATT_LABEL);
-		if (label == null)
-		{
-			logMissingAttribute(element, ATT_LABEL);
-			return true;
-		}
-
-		String processorTypeId = element.getAttribute(ATT_TYPE_ID);
-		if (processorTypeId == null)
-		{
-			logMissingAttribute(element, ATT_TYPE_ID);
-			return true;
-		}
-
-		String classpath = element.getAttribute(ATT_CLASSPATH);
-		if (classpath == null)
-		{
-			logMissingAttribute(element, ATT_CLASSPATH);
-			return true;
-		}
-
-		String debuggerId = element.getAttribute(ATT_DEBUGGER_ID);
-
-		String supports = element.getAttribute(ATT_SUPPORTS);
-		if (classpath == null)
-		{
-			logMissingAttribute(element, ATT_SUPPORTS);
-			return true;
-		}
-
-		registry.addProcessor(element.getContributor().getName(), id, label, processorTypeId, classpath, debuggerId, supports);
-
-		return true;
-	}
-
-	public void readElement(ProcessorRegistry registry, IConfigurationElement element)
-	{
-		this.registry = registry;
-		readElement(element);
-	}
-
-	public void addConfigs(ProcessorRegistry registry)
-	{
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		this.registry = registry;
-		readRegistry(extensionRegistry, LaunchingPlugin.PLUGIN_ID, "processor"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorTypeRegistry.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorTypeRegistry.java
deleted file mode 100644
index 2e80ad5..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorTypeRegistry.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching.registry;
-
-import java.io.ByteArrayInputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.internal.launching.FeaturePreferences;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-import org.eclipse.wst.xsl.internal.launching.OutputPropertyPreferences;
-import org.eclipse.wst.xsl.internal.launching.ProcessorType;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class ProcessorTypeRegistry
-{
-	protected static final String DESC_SUFFIX = ".DESC"; //$NON-NLS-1$
-	protected static final String TYPE_SUFFIX = ".TYPE"; //$NON-NLS-1$
-
-	private final List<IConfigurationElement> elements = new ArrayList<IConfigurationElement>();
-	private IProcessorType[] installTypes;
-
-	public ProcessorTypeRegistry()
-	{
-		ProcessorTypeRegistryReader registryReader = new ProcessorTypeRegistryReader();
-		registryReader.addConfigs(this);
-	}
-
-	public IProcessorType[] getProcessorTypes()
-	{
-		if (installTypes == null)
-		{
-			List<ProcessorType> types = new ArrayList<ProcessorType>();
-			String featureXMLString = LaunchingPlugin.getDefault().getPluginPreferences().getString(XSLTRuntime.PREF_FEATURE_XML);
-			// If the preference was found, load VMs from it into memory
-			FeaturePreferences prefs = null;
-			if (featureXMLString.length() > 0)
-			{
-				try
-				{
-					ByteArrayInputStream inputStream = new ByteArrayInputStream(featureXMLString.getBytes());
-					prefs = FeaturePreferences.fromXML(inputStream);
-				}
-				catch (CoreException e)
-				{
-					LaunchingPlugin.log(e);
-				}
-			}
-
-			String propXMLString = LaunchingPlugin.getDefault().getPluginPreferences().getString(XSLTRuntime.PREF_OUTPUT_PROPERTIES_XML);
-			// If the preference was found, load VMs from it into memory
-			OutputPropertyPreferences outputprefs = null;
-			if (propXMLString.length() > 0)
-			{
-				try
-				{
-					ByteArrayInputStream inputStream = new ByteArrayInputStream(propXMLString.getBytes());
-					outputprefs = OutputPropertyPreferences.fromXML(inputStream);
-				}
-				catch (CoreException e)
-				{
-					LaunchingPlugin.log(e);
-				}
-			}
-
-			for (Iterator<IConfigurationElement> iter = elements.iterator(); iter.hasNext();)
-			{
-				IConfigurationElement element = (IConfigurationElement) iter.next();
-				String id = element.getAttribute(ProcessorTypeRegistryReader.ATT_ID);
-				String label = element.getAttribute(ProcessorTypeRegistryReader.ATT_LABEL);
-				String transFactoryName = element.getAttribute(ProcessorTypeRegistryReader.ATT_TRANSFORMER_FACTORY_NAME);
-				Map<String, String> featureValues = new HashMap<String, String>();
-				Properties propertyValues = new Properties();
-				if (prefs != null && prefs.getFeaturesValues(id) != null)
-					featureValues.putAll(prefs.getFeaturesValues(id));
-				if (outputprefs != null && outputprefs.getOutputPropertyValues(id) != null)
-					propertyValues.putAll(outputprefs.getOutputPropertyValues(id));
-
-				String outputProperties = element.getAttribute(ProcessorTypeRegistryReader.ATT_OUTPUT_PROPERTIES);
-				URL outputPropertiesURL = FileLocator.find(Platform.getBundle(element.getContributor().getName()), new Path(outputProperties), null);
-				String featureProperties = element.getAttribute(ProcessorTypeRegistryReader.ATT_FEATURE_PROPERTIES);
-				URL featurePropertiesURL = FileLocator.find(Platform.getBundle(element.getContributor().getName()), new Path(featureProperties), null);
-				
-				types.add(new ProcessorType(id, label, featurePropertiesURL, outputPropertiesURL, featureValues, propertyValues, transFactoryName));
-			}
-			installTypes = (IProcessorType[]) types.toArray(new IProcessorType[0]);
-		}
-		return installTypes;
-	}
-
-	public IProcessorType[] getProcessorTypesExclJREDefault()
-	{
-		IProcessorType[] installTypes = getProcessorTypes();
-		List<IProcessorType> exclTypes = new ArrayList<IProcessorType>(installTypes.length - 1);
-		for (IProcessorType type : installTypes)
-		{
-			if (!type.isJREDefault())
-				exclTypes.add(type);
-		}
-		return (IProcessorType[]) exclTypes.toArray(new IProcessorType[0]);
-	}
-
-	public void addType(IConfigurationElement element)
-	{
-		elements.add(element);
-	}
-
-	public IProcessorType getProcessorType(String id)
-	{
-		IProcessorType[] installTypes = getProcessorTypes();
-		for (IProcessorType type : installTypes)
-		{
-			if (type.getId().equals(id))
-				return type;
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorTypeRegistryReader.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorTypeRegistryReader.java
deleted file mode 100644
index 9c7f1e0..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/ProcessorTypeRegistryReader.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.launching.registry;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-
-public class ProcessorTypeRegistryReader extends AbstractRegistryReader
-{
-	public static final String TAG_processorType = "processorType"; //$NON-NLS-1$
-	public static final String ATT_ID = "id"; //$NON-NLS-1$
-	public static final String ATT_LABEL = "label"; //$NON-NLS-1$
-	public static final String ATT_TRANSFORMER_FACTORY_NAME = "transformerFactory"; //$NON-NLS-1$
-	public static final String ATT_OUTPUT_PROPERTIES = "outputProperties"; //$NON-NLS-1$
-	public static final String ATT_FEATURE_PROPERTIES = "featureProperties"; //$NON-NLS-1$
-
-	private ProcessorTypeRegistry registry;
-
-	@Override
-	protected boolean readElement(IConfigurationElement element)
-	{
-		if (!element.getName().equals(TAG_processorType))
-			return false;
-
-		String id = element.getAttribute(ATT_ID);
-		if (id == null)
-		{
-			logMissingAttribute(element, ATT_ID);
-			return true;
-		}
-
-		String label = element.getAttribute(ATT_LABEL);
-		if (label == null)
-		{
-			logMissingAttribute(element, ATT_LABEL);
-			return true;
-		}
-
-		String outputProperties = element.getAttribute(ATT_OUTPUT_PROPERTIES);
-		if (outputProperties == null)
-		{
-			logMissingAttribute(element, ATT_OUTPUT_PROPERTIES);
-			return true;
-		}
-
-		String featureProperties = element.getAttribute(ATT_FEATURE_PROPERTIES);
-		if (featureProperties == null)
-		{
-			logMissingAttribute(element, ATT_FEATURE_PROPERTIES);
-			return true;
-		}
-
-		registry.addType(element);
-
-		return true;
-	}
-
-	public void readElement(ProcessorTypeRegistry registry, IConfigurationElement element)
-	{
-		this.registry = registry;
-		readElement(element);
-	}
-
-	protected void addConfigs(ProcessorTypeRegistry registry)
-	{
-		IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-		this.registry = registry;
-		readRegistry(extensionRegistry, LaunchingPlugin.PLUGIN_ID, "processorType"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/messages.properties b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/messages.properties
deleted file mode 100644
index 6a64057..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/internal/launching/registry/messages.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-AbstractRegistryReader.3=, extension 
-AbstractRegistryReader.5=Required attribute '
-AbstractRegistryReader.6=' not defined
-AbstractRegistryReader.7=Required sub element '
-AbstractRegistryReader.8=' not defined
-AbstractRegistryReader.9=Unknown extension tag found: 
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IDebugger.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IDebugger.java
deleted file mode 100644
index de47be9..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IDebugger.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching;
-
-/**
- * An XSLT debugger. Typically this will have been 
- * contributed via the <code>org.eclipse.wst.xsl.launching.debugger</code> extension point.
- * 
- * @author Doug Satchwell
- */
-public interface IDebugger
-{
-	/**
-	 * Get the unique id for this debugger.
-	 * @return debugger id
-	 */
-	String getId();
-
-	/**
-	 * Get the set of bundle-relative jar files to add to the classpath. 
-	 * @return array of bundle-relative jars
-	 */
-	String[] getClassPath();
-
-	/**
-	 * Get a unique name for this debugger
-	 * @return the name for the debugger
-	 */
-	String getName();
-
-	/**
-	 * Get the processor type that this debugger is associated with
-	 * @return the processor type
-	 */
-	IProcessorType getProcessorType();
-
-	/**
-	 * Get the class name for this debugger
-	 * @return the class name
-	 */
-	String getClassName();
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IFeature.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IFeature.java
deleted file mode 100644
index 3fff40e..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IFeature.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * A feature supported by an XSLT processor. 
- * 
- * @author Doug Satchwell
- */
-public interface IFeature
-{
-	/**
-	 * Constant for features of type <code>string</code>
-	 * @see #getType()
-	 */
-	String TYPE_STRING = "string"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for features of type <code>boolean</code>
-	 * @see #getType()
-	 */
-	String TYPE_BOOLEAN = "boolean"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for features of type <code>int</code>
-	 * @see #getType()
-	 */
-	String TYPE_INT = "int"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for features of type <code>double</code>
-	 * @see #getType()
-	 */
-	String TYPE_DOUBLE = "double"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for features of type <code>float</code>
-	 * @see #getType()
-	 */
-	String TYPE_FLOAT = "float"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for features of type <code>class</code>
-	 * @see #getType()
-	 */
-	String TYPE_CLASS = "class"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for features of type <code>object</code>
-	 * @see #getType()
-	 */
-	String TYPE_OBJECT = "object"; //$NON-NLS-1$
-
-	/**
-	 * Get the URI for this feature
-	 * @return the feature URI
-	 */
-	String getURI();
-
-	/**
-	 * Get a description for this feature
-	 * @return the feature description
-	 */
-	String getDescription();
-
-	/**
-	 * Get the type of this feature. Will match one of the TYPE constants in this interface.
-	 * @return the feature type: one of <code>TYPE_STRING</code>, <code>TYPE_BOOLEAN</code>, 
-	 * <code>TYPE_INT</code>, <code>TYPE_DOUBLE</code>, <code>TYPE_FLOAT</code>, <code>TYPE_CLASS</code>, 
-	 * or <code>TYPE_OBJECT</code>
-	 */
-	String getType();
-
-	/**
-	 * Determine whether the given value is a valid one for this feature.
-	 * @return an <code>IStatus</code> with severity <code>OK</code> if valid, or <code>ERROR</code> if invalid.
-	 */
-	IStatus validateValue(String value);
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IOutputProperty.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IOutputProperty.java
deleted file mode 100644
index 4e3ebe5..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IOutputProperty.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching;
-
-/**
- * An output property supported by an XSLT processor. 
- * 
- * @author Doug Satchwell
- */
-public interface IOutputProperty
-{
-	/**
-	 * Get the URI of this output property. 
-	 * @return a unique URI
-	 */
-	String getURI();
-
-	/**
-	 * Get a description for this output property. 
-	 * @return a description
-	 */
-	String getDescription();
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorInstall.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorInstall.java
deleted file mode 100644
index 12e70e6..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorInstall.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching;
-
-/**
- * An instance of an XSLT processor (e.g. Xalan 2.7.0).
- * 
- * @see IProcessorInstall
- * @author Doug Satchwell
- */
-public interface IProcessorInstall
-{
-	/**
-	 * Get the unqiue id of this install
-	 * @return the unique id
-	 */
-	String getId();
-
-	/**
-	 * Get the name of this install
-	 * @return the name of this install
-	 */
-	String getName();
-
-	/**
-	 * Get the the processor type associated with this install
-	 * @return the processor type id
-	 */
-	IProcessorType getProcessorType();
-
-	/**
-	 * Get the jar files for this processor
-	 * @return a set of jar files
-	 */
-	IProcessorJar[] getProcessorJars();
-
-	/**
-	 * Get whether this install has been contributed via the <code>org.eclipse.wst.xsl.launching.processor</code> extension point.
-	 * @return <code>true</code> if contributed via the extension point, otherwise <code>false</code>.
-	 */
-	boolean isContributed();
-
-	/**
-	 * Get the list of supported XSLT versions
-	 * @return <code>true</code> if this install has a debugger, otherwise <code>false</code>.
-	 */
-	// TODO deprecate and use boolean supports instaed
-	String getSupports();
-
-	/**
-	 * Get whether this install supports the specified xslt version.
-	 * @return <code>true</code> if this install supports the version, otherwise <code>false</code>.
-	 */
-	boolean supports(String xsltVersion);
-
-	/**
-	 * Get the debugger associated with this install
-	 * @return the debugger, or null if no debugger has been set
-	 */
-	IDebugger getDebugger();
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorInvoker.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorInvoker.java
deleted file mode 100644
index 587e440..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorInvoker.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching;
-
-public interface IProcessorInvoker
-{
-	String getId();
-
-	String getInvokerClassName();
-
-	String[] getClasspathEntries();
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorJar.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorJar.java
deleted file mode 100644
index f02dc5a..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorJar.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching;
-
-import java.net.URL;
-
-import org.eclipse.core.runtime.IPath;
-
-/**
- * A jar file for an XSLT processor
- * 
- * @see IProcessorInstall
- * @author Doug Satchwell
- */
-public interface IProcessorJar
-{
-	/**
-	 * The path may be relative or absolute; in the workspace or external.
-	 * @return the path to this jar
-	 */
-	IPath getPath();
-
-	/**
-	 * The URL will always be absolute and can be opened.
-	 * @return a URL to the jar
-	 */
-	URL asURL();
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorType.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorType.java
deleted file mode 100644
index a518a13..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/IProcessorType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching;
-
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * A particular type of XSLT Processor (e.g. Xalan) for which there may be any number of installs.
- * 
- * @see IProcessorInstall
- * @author Doug Satchwell
- */
-public interface IProcessorType
-{
-	String getId();
-
-	String getLabel();
-
-	boolean isJREDefault();
-
-	String getTransformerFactoryName();
-
-	IFeature[] getFeatures();
-
-	Map<String, String> getFeatureValues();
-
-	IOutputProperty[] getOutputProperties();
-
-	Properties getOutputPropertyValues();
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/Messages.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/Messages.java
deleted file mode 100644
index 7687483..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.launching;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.launching.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/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/ProcessorInstall.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/ProcessorInstall.java
deleted file mode 100644
index 755c5f0..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/ProcessorInstall.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-import org.eclipse.wst.xsl.internal.launching.PluginProcessorJar;
-import org.eclipse.wst.xsl.internal.launching.Utils;
-
-public class ProcessorInstall implements IProcessorInstall
-{
-	private final String id;
-	private String name;
-	private String type;
-	private IProcessorJar[] jars;
-	private final boolean contributed;
-	private String debuggerId;
-	private String supports;
-
-	public ProcessorInstall(String id, String label, String typeId, IProcessorJar[] jars, String debuggerId, String supports, boolean contributed)
-	{
-		this.id = id;
-		name = label;
-		type = typeId;
-		this.debuggerId = debuggerId;
-		this.contributed = contributed;
-		this.jars = jars;
-		this.supports = supports;
-	}
-
-	public String getId()
-	{
-		return id;
-	}
-
-	public String getName()
-	{
-		return name;
-	}
-
-	public void setName(String name)
-	{
-		this.name = name;
-	}
-
-	public IProcessorJar[] getProcessorJars()
-	{
-		return jars;
-	}
-
-	public void setProcessorJars(IProcessorJar[] jars)
-	{
-		this.jars = jars;
-	}
-
-	public String getProcessorTypeId()
-	{
-		return type;
-	}
-
-	public IProcessorType getProcessorType()
-	{
-		return XSLTRuntime.getProcessorType(type);
-	}
-
-	public void setProcessorTypeId(String id)
-	{
-		type = id;
-	}
-
-	public boolean isContributed()
-	{
-		return contributed;
-	}
-
-	public static IProcessorJar[] createJars(String bundleId, String classpath)
-	{
-		IProcessorJar[] jars;
-		if (classpath == null)
-			return new IProcessorJar[0];
-		String[] jarstring = classpath.split(";"); //$NON-NLS-1$
-		jars = new IProcessorJar[jarstring.length];
-		for (int i = 0; i < jarstring.length; i++)
-		{
-			String jar = jarstring[i];
-			try
-			{
-				if (jar.startsWith("${eclipse_orbit:") && jar.endsWith("}")) //$NON-NLS-1$ //$NON-NLS-2$
-				{
-					jar = jar.substring("${eclipse_orbit:".length()); //$NON-NLS-1$
-					jar = jar.substring(0,jar.length()-1);
-					//jar = Utils.getFileLocation(jar,"");
-					jars[i] = new PluginProcessorJar(jar, null);
-				}
-				else
-				{
-					jar = Utils.getFileLocation(bundleId,jar);
-					jars[i] = new PluginProcessorJar(bundleId, new Path(jar));
-				}
-			}
-			catch (CoreException e)
-			{
-				LaunchingPlugin.log(e);
-			}
-		}
-		return jars;
-	}
-
-	public boolean hasDebugger()
-	{
-		return debuggerId != null;
-	}
-
-	public boolean supports(String xsltVersion)
-	{
-		return supports.indexOf(xsltVersion) >= 0;
-	}
-
-	public String getSupports()
-	{
-		return supports;
-	}
-
-	public void setSupports(String supports)
-	{
-		this.supports = supports;
-	}
-
-	public IDebugger getDebugger()
-	{
-		return XSLTRuntime.getDebugger(debuggerId);
-	}
-
-	public void setDebuggerId(String debuggerId)
-	{
-		this.debuggerId = debuggerId;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/XSLLaunchConfigurationConstants.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/XSLLaunchConfigurationConstants.java
deleted file mode 100644
index 6c133d6..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/XSLLaunchConfigurationConstants.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching;
-
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-
-public class XSLLaunchConfigurationConstants
-{
-	public static final String INVOKER_DESCRIPTOR = LaunchingPlugin.PLUGIN_ID + ".INVOKER_DESCRIPTOR"; //$NON-NLS-1$
-	public static final String ATTR_PROCESSOR = LaunchingPlugin.PLUGIN_ID + ".ATTR_PROCESSOR"; //$NON-NLS-1$
-	public static final String ATTR_LAUNCH_TYPE = LaunchingPlugin.PLUGIN_ID + ".ATTR_LAUNCH_TYPE"; //$NON-NLS-1$
-	public static final String ATTR_BASE_URI_TYPE = LaunchingPlugin.PLUGIN_ID + ".ATTR_BASE_URI_TYPE"; //$NON-NLS-1$
-	public static final String ATTR_BASE_URI_DIRECTORY = LaunchingPlugin.PLUGIN_ID + ".ATTR_BASE_URI_DIRECTORY"; //$NON-NLS-1$
-	public static final String ATTR_PROJECT_NAME = LaunchingPlugin.PLUGIN_ID + ".ATTR_PROJECT_NAME"; //$NON-NLS-1$
-	public static final String ATTR_INPUT_FILE = LaunchingPlugin.PLUGIN_ID + ".ATTR_INPUT_FILE"; //$NON-NLS-1$
-	public static final String ATTR_OUTPUT_FILE = LaunchingPlugin.PLUGIN_ID + ".ATTR_OUTPUT_FILE"; //$NON-NLS-1$
-	public static final String ATTR_OUTPUT_METHOD = LaunchingPlugin.PLUGIN_ID + ".ATTR_OUTPUT_METHOD"; //$NON-NLS-1$
-	public static final String ATTR_OUTPUT_PROPERTIES = LaunchingPlugin.PLUGIN_ID + ".ATTR_OUTPUT_PROPERTIES"; //$NON-NLS-1$
-	public static final String ATTR_STYLESHEETS_LIST = LaunchingPlugin.PLUGIN_ID + ".ATTR_STYLESHEETS_LIST"; //$NON-NLS-1$
-	public static final String ATTR_RENDER_TO = LaunchingPlugin.PLUGIN_ID + ".ATTR_RENDER_TO"; //$NON-NLS-1$
-	public static final String ID_LAUNCH_CONFIG_TYPE = LaunchingPlugin.PLUGIN_ID + ".launchConfigurationType"; //$NON-NLS-1$
-	public static final String ATTR_PERFORM_RENDER = LaunchingPlugin.PLUGIN_ID + ".ATTR_PERFORM_RENDER"; //$NON-NLS-1$
-	public static final String ATTR_USE_DEFAULT_OUTPUT_FILE = LaunchingPlugin.PLUGIN_ID + ".ATTR_USE_DEFAULT_OUTPUT_FILE"; //$NON-NLS-1$
-	public static final String ATTR_OPEN_FILE = LaunchingPlugin.PLUGIN_ID + ".ATTR_OPEN_FILE"; //$NON-NLS-1$
-	public static final String ATTR_PROCESSOR_WORKING_DIR = LaunchingPlugin.PLUGIN_ID + ".ATTR_PROCESSOR_WORKING_DIR"; //$NON-NLS-1$
-	public static final String ATTR_USE_DEFAULT_PROCESSOR_WORKING_DIR = LaunchingPlugin.PLUGIN_ID + ".ATTR_USE_DEFAULT_PROCESSOR_WORKING_DIR"; //$NON-NLS-1$
-	public static final String ATTR_USE_DEFAULT_PROCESSOR = LaunchingPlugin.PLUGIN_ID + ".ATTR_USE_DEFAULT_PROCESSOR"; //$NON-NLS-1$
-	public static final String ATTR_USE_FEATURES_FROM_PREFERENCES = LaunchingPlugin.PLUGIN_ID + ".ATTR_USE_FEATURES_FROM_PREFERENCES"; //$NON-NLS-1$
-	public static final String ATTR_USE_PROPERTIES_FROM_PREFERENCES = LaunchingPlugin.PLUGIN_ID + ".ATTR_USE_PROPERTIES_FROM_PREFERENCES"; //$NON-NLS-1$
-	public static final String ATTR_JRE_DEFAULT_TYPE_TYPE = ".ATTR_JRE_DEFAULT_TYPE_TYPE"; //$NON-NLS-1$
-	public static final String ATTR_FEATURES = LaunchingPlugin.PLUGIN_ID + ".ATTR_FEATURES"; //$NON-NLS-1$
-	public static final String ATTR_PIPELINE = LaunchingPlugin.PLUGIN_ID + ".ATTR_PIPELINE"; //$NON-NLS-1$
-	public static final String ATTR_DEFAULT_DEBUGGING_INSTALL_ID = LaunchingPlugin.PLUGIN_ID + ".ATTR_DEFAULT_DEBUGGING_INSTALL_ID";; //$NON-NLS-1$
-
-	public static final String XALAN_TYPE_ID = "org.eclipse.wst.xsl.xalan.processorType"; //$NON-NLS-1$
-	public static final String SAXONB_TYPE_ID = "org.eclipse.wst.xsl.saxon.processorType"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/XSLTRuntime.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/XSLTRuntime.java
deleted file mode 100644
index e48fdc2..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/XSLTRuntime.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IFile;
-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.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.wst.xsl.internal.launching.FeaturePreferences;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-import org.eclipse.wst.xsl.internal.launching.OutputPropertyPreferences;
-import org.eclipse.wst.xsl.internal.launching.ProcessorJar;
-import org.eclipse.wst.xsl.internal.launching.ProcessorPreferences;
-import org.eclipse.wst.xsl.internal.launching.registry.DebuggerRegistry;
-import org.eclipse.wst.xsl.internal.launching.registry.InvokerRegistry;
-import org.eclipse.wst.xsl.internal.launching.registry.ProcessorRegistry;
-import org.eclipse.wst.xsl.internal.launching.registry.ProcessorTypeRegistry;
-
-public class XSLTRuntime
-{
-	public static final String PREF_PROCESSOR_XML = "PREF_PROCESSOR_XML"; //$NON-NLS-1$
-	public static final String PREF_FEATURE_XML = "PREF_FEATURE_XML"; //$NON-NLS-1$
-	public static final String PREF_OUTPUT_PROPERTIES_XML = "PREF_OUTPUT_PROPERTIES_XML"; //$NON-NLS-1$
-	public static final String JRE_DEFAULT_PROCESSOR_ID = "org.eclipse.wst.xsl.launching.jre.default"; //$NON-NLS-1$
-	public static final String JRE_DEFAULT_PROCESSOR_TYPE_ID = "org.eclipse.wst.xsl.launching.processorType.jreDefault"; //$NON-NLS-1$
-
-	private static byte[] NEXT_ID_LOCK = new byte[0];
-	private static byte[] REGISTRY_LOCK = new byte[0];
-
-	private static int lastStandinID;
-	private static ProcessorTypeRegistry processorTypeRegistry;
-	private static ProcessorRegistry processorRegistry;
-	private static InvokerRegistry invokerRegistry;
-	private static DebuggerRegistry debuggerRegistry;
-
-	private static ProcessorTypeRegistry getProcessorTypeRegistry()
-	{
-		synchronized (REGISTRY_LOCK)
-		{
-			if (processorTypeRegistry == null)
-				processorTypeRegistry = new ProcessorTypeRegistry();
-		}
-		return processorTypeRegistry;
-	}
-
-	public static ProcessorRegistry getProcessorRegistry()
-	{
-		synchronized (REGISTRY_LOCK)
-		{
-			if (processorRegistry == null)
-				processorRegistry = new ProcessorRegistry();
-		}
-		return processorRegistry;
-	}
-
-	private static InvokerRegistry getInvokerRegistry()
-	{
-		synchronized (REGISTRY_LOCK)
-		{
-			if (invokerRegistry == null)
-				invokerRegistry = new InvokerRegistry();
-		}
-		return invokerRegistry;
-	}
-
-	private static DebuggerRegistry getDebuggerRegistry()
-	{
-		synchronized (REGISTRY_LOCK)
-		{
-			if (debuggerRegistry == null)
-				debuggerRegistry = new DebuggerRegistry();
-		}
-		return debuggerRegistry;
-	}
-	
-	private static void savePreferences()
-	{
-		LaunchingPlugin.getDefault().savePluginPreferences();
-		synchronized (REGISTRY_LOCK)
-		{
-			// force the registries to be re-initialised next time it is required
-			processorRegistry = null;
-			processorTypeRegistry = null;
-		}
-	}
-
-	/**
-	 * Find a unique processor install id. Check existing 'real' processors, as
-	 * well as the last id used for a standin.
-	 */
-	public static String createUniqueProcessorId(IProcessorType type)
-	{
-		IProcessorInstall[] installs = XSLTRuntime.getProcessors(type.getId());
-		String id = null;
-		synchronized (NEXT_ID_LOCK)
-		{
-			do
-			{
-				id = String.valueOf(++lastStandinID);
-			}
-			while (isTaken(id, installs));
-		}
-		return id;
-	}
-
-	public static IProcessorJar createProcessorJar(IPath path)
-	{
-		return new ProcessorJar(path);
-	}
-
-	private static boolean isTaken(String id, IProcessorInstall[] installs)
-	{
-		for (IProcessorInstall install : installs)
-		{
-			if (install.getId().equals(id))
-				return true;
-		}
-		return false;
-	}
-
-	public static IDebugger[] getDebuggers()
-	{
-		return getDebuggerRegistry().getDebuggers();
-	}
-
-	public static IDebugger getDebugger(String id)
-	{
-		return getDebuggerRegistry().getDebugger(id);
-	}
-
-	public static IProcessorInstall[] getProcessors()
-	{
-		return getProcessorRegistry().getProcessors();
-	}
-
-	public static IProcessorInstall[] getProcessors(String typeId)
-	{
-		return getProcessorRegistry().getProcessors(typeId);
-	}
-
-	public static IProcessorInstall getProcessor(String processorId)
-	{
-		IProcessorInstall[] processors = getProcessors();
-		for (IProcessorInstall install : processors)
-		{
-			if (install.getId().equals(processorId))
-				return install;
-		}
-		return null;
-	}
-
-	public static IProcessorInstall getDefaultProcessor()
-	{
-		return getProcessorRegistry().getDefaultProcessor();
-	}
-
-	public static IProcessorInstall getJREDefaultProcessor()
-	{
-		return getProcessorRegistry().getJREDefaultProcessor();
-	}
-
-	public static IProcessorType[] getProcessorTypes()
-	{
-		return getProcessorTypeRegistry().getProcessorTypes();
-	}
-
-	public static IProcessorType[] getProcessorTypesExclJREDefault()
-	{
-		return getProcessorTypeRegistry().getProcessorTypesExclJREDefault();
-	}
-
-	public static IProcessorType getProcessorType(String id)
-	{
-		return getProcessorTypeRegistry().getProcessorType(id);
-	}
-
-	public static IProcessorInvoker getProcessorInvoker(String invokerId)
-	{
-		return getInvokerRegistry().getProcessorInvoker(invokerId);
-	}
-
-	public static IProcessorInvoker[] getProcessorInvokers()
-	{
-		return getInvokerRegistry().getProcessorInvokers();
-	}
-
-	private static Preferences getPreferences()
-	{
-		return LaunchingPlugin.getDefault().getPluginPreferences();
-	}
-
-	public static void saveFeaturePreferences(Map<IProcessorType, Map<String, String>> typeFeatures, IProgressMonitor monitor) throws CoreException
-	{
-		if (monitor.isCanceled())
-			return;
-		try
-		{
-			monitor.beginTask(Messages.getString("XSLTRuntime.5"), 100); //$NON-NLS-1$
-			FeaturePreferences prefs = new FeaturePreferences();
-			Map<String,Map<String,String>> typeIdFeatures = new HashMap<String,Map<String,String>>(typeFeatures.size());
-			for (IProcessorType type : typeFeatures.keySet())
-			{
-				Map<String,String> values = typeFeatures.get(type);
-				typeIdFeatures.put(type.getId(), values);
-			}
-			prefs.setTypeFeatures(typeIdFeatures);
-			String xml = prefs.getAsXML();
-			monitor.worked(40);
-			if (monitor.isCanceled())
-				return;
-			XSLTRuntime.getPreferences().setValue(XSLTRuntime.PREF_FEATURE_XML, xml);
-			monitor.worked(30);
-			if (monitor.isCanceled())
-				return;
-			XSLTRuntime.savePreferences();
-			monitor.worked(30);
-		}
-		catch (Exception e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR,LaunchingPlugin.PLUGIN_ID,Messages.getString("XSLTRuntime.6"),e)); //$NON-NLS-1$
-		}
-		finally
-		{
-			monitor.done();
-		}
-	}
-
-	public static void saveOutputPropertyPreferences(Map<IProcessorType, Properties> typeProperties, IProgressMonitor monitor) throws CoreException
-	{
-		if (monitor.isCanceled())
-			return;
-		try
-		{
-			monitor.beginTask(Messages.getString("XSLTRuntime.7"), 100); //$NON-NLS-1$
-			OutputPropertyPreferences prefs = new OutputPropertyPreferences();
-			for (IProcessorType type : typeProperties.keySet())
-			{
-				prefs.setOutputPropertyValues(type.getId(), typeProperties.get(type));
-			}
-			String xml = prefs.getAsXML();
-			monitor.worked(40);
-			if (monitor.isCanceled())
-				return;
-			XSLTRuntime.getPreferences().setValue(XSLTRuntime.PREF_OUTPUT_PROPERTIES_XML, xml);
-			monitor.worked(30);
-			if (monitor.isCanceled())
-				return;
-			XSLTRuntime.savePreferences();
-			monitor.worked(30);
-		}
-		catch (Exception e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR,LaunchingPlugin.PLUGIN_ID,Messages.getString("XSLTRuntime.8"),e)); //$NON-NLS-1$
-		}
-		finally
-		{
-			monitor.done();
-		}
-	}
-
-	public static void saveProcessorPreferences(IProcessorInstall[] installs, IProcessorInstall defaultInstall, IProgressMonitor monitor) throws CoreException
-	{
-		if (monitor.isCanceled())
-			return;
-		try
-		{
-			monitor.beginTask(Messages.getString("XSLTRuntime.9"), 100); //$NON-NLS-1$
-			ProcessorPreferences prefs = new ProcessorPreferences();
-			if (defaultInstall != null)
-				prefs.setDefaultProcessorId(defaultInstall.getId());
-			prefs.setProcessors(new ArrayList<IProcessorInstall>(Arrays.asList(installs)));
-			String xml = prefs.getAsXML();
-			monitor.worked(40);
-			if (monitor.isCanceled())
-				return;
-			XSLTRuntime.getPreferences().setValue(XSLTRuntime.PREF_PROCESSOR_XML, xml);
-			monitor.worked(30);
-			if (monitor.isCanceled())
-				return;
-			XSLTRuntime.savePreferences();
-			monitor.worked(30);
-		}
-		catch (Exception e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR,LaunchingPlugin.PLUGIN_ID,Messages.getString("XSLTRuntime.10"),e)); //$NON-NLS-1$
-		}
-		finally
-		{
-			monitor.done();
-		}
-	}
-
-	public static Properties createDefaultOutputProperties(String typeId)
-	{
-		Properties props = new Properties();
-		if (JRE_DEFAULT_PROCESSOR_TYPE_ID.equals(typeId))
-			props.put("indent", "yes"); //$NON-NLS-1$ //$NON-NLS-2$
-		else if (XSLLaunchConfigurationConstants.XALAN_TYPE_ID.equals(typeId))
-			props.put("{http://xml.apache.org/xslt}indent-amount", "4"); //$NON-NLS-1$ //$NON-NLS-2$
-		else if (XSLLaunchConfigurationConstants.SAXONB_TYPE_ID.equals(typeId))
-			props.put("{http://saxon.sf.net/}indent-spaces", "4"); //$NON-NLS-1$ //$NON-NLS-2$
-		return props;
-	}
-	
-	/*
-	 * TODO move to XSLCore
-	 */
-	public static boolean isXMLFile(IFile file)
-	{
-		IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
-		IContentType[] types = contentTypeManager.findContentTypesFor(file.getName());
-		for (IContentType contentType : types)
-		{
-			if (contentType.isKindOf(contentTypeManager.getContentType("org.eclipse.core.runtime.xml")) || contentType.isKindOf(contentTypeManager.getContentType("org.eclipse.wst.xml.core.xmlsource"))) //$NON-NLS-1$ //$NON-NLS-2$
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/*
-	 * TODO move to XSLCore
-	 */
-	public static boolean isXSLFile(IFile file)
-	{
-		IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
-		IContentType[] types = contentTypeManager.findContentTypesFor(file.getName());
-		for (IContentType contentType : types)
-		{
-			if (contentType.isKindOf(contentTypeManager.getContentType("org.eclipse.wst.xml.core.xslsource"))) //$NON-NLS-1$
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchAttribute.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchAttribute.java
deleted file mode 100644
index e6b3c86..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchAttribute.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.config;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.variables.VariablesPlugin;
-
-public class LaunchAttribute
-{
-	public static final String TYPE_SUFFIX = ".TYPE"; //$NON-NLS-1$
-	public static final String VALUE_SUFFIX = ".VALUE"; //$NON-NLS-1$
-
-	public static final String TYPE_STRING = "string"; //$NON-NLS-1$
-	public static final String TYPE_BOOLEAN = "boolean"; //$NON-NLS-1$
-	public static final String TYPE_INT = "int"; //$NON-NLS-1$
-	public static final String TYPE_DOUBLE = "double"; //$NON-NLS-1$
-	public static final String TYPE_FLOAT = "float"; //$NON-NLS-1$
-	public static final String TYPE_CLASS = "class"; //$NON-NLS-1$
-	public static final String TYPE_OBJECT = "object"; //$NON-NLS-1$
-
-	public final String uri;
-	public String type;
-	public String value;
-
-	public LaunchAttribute(String uri, String type, String value)
-	{
-		this.uri = uri;
-		this.type = type;
-		this.value = value;
-	}
-
-	public void setValue(String value)
-	{
-		this.value = value;
-	}
-	
-	public String getResolvedValue() throws CoreException
-	{
-		return VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(value);
-	}
-
-	@Override
-	public int hashCode()
-	{
-		return uri.hashCode();
-	}
-
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (obj instanceof LaunchAttribute)
-		{
-			LaunchAttribute att = (LaunchAttribute) obj;
-			return att.uri.equals(uri);
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchFeatures.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchFeatures.java
deleted file mode 100644
index d531464..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchFeatures.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.config;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xsl.internal.launching.PreferenceUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class LaunchFeatures
-{
-	private final Set<LaunchAttribute> features = new HashSet<LaunchAttribute>();
-
-	public Set<LaunchAttribute> getFeatures()
-	{
-		return features;
-	}
-
-	public void addFeature(LaunchAttribute feature)
-	{
-		features.add(feature);
-	}
-
-	public LaunchAttribute getFeature(String uri)
-	{
-		for (Iterator<LaunchAttribute> iter = features.iterator(); iter.hasNext();)
-		{
-			LaunchAttribute tv = (LaunchAttribute) iter.next();
-			if (tv.uri.equals(uri))
-				return tv;
-		}
-		return null;
-	}
-
-	public void removeFeature(String uri)
-	{
-		for (Iterator<LaunchAttribute> iter = features.iterator(); iter.hasNext();)
-		{
-			LaunchAttribute feature = (LaunchAttribute) iter.next();
-			if (feature.uri.equals(uri))
-				iter.remove();
-		}
-	}
-
-	public String toXML() throws ParserConfigurationException, IOException, TransformerException
-	{
-		Document doc = PreferenceUtil.getDocument();
-
-		Element featuresEl = doc.createElement("Features"); //$NON-NLS-1$
-		doc.appendChild(featuresEl);
-
-		for (Iterator<LaunchAttribute> iter = features.iterator(); iter.hasNext();)
-		{
-			LaunchAttribute feature = (LaunchAttribute) iter.next();
-			if (feature.value == null)
-				continue;
-			Element featureEl = doc.createElement("Feature"); //$NON-NLS-1$
-			featureEl.setAttribute("name", feature.uri); //$NON-NLS-1$
-			featureEl.setAttribute("type", feature.type); //$NON-NLS-1$
-			featureEl.setAttribute("value", feature.value); //$NON-NLS-1$
-			featuresEl.appendChild(featureEl);
-		}
-
-		return PreferenceUtil.serializeDocument(doc);
-	}
-
-	public static LaunchFeatures fromXML(InputStream inputStream) throws CoreException
-	{
-		Document doc = PreferenceUtil.getDocument(inputStream);
-
-		LaunchFeatures pdef = new LaunchFeatures();
-
-		Element featuresEl = doc.getDocumentElement();
-
-		NodeList featureEls = featuresEl.getElementsByTagName("Feature"); //$NON-NLS-1$
-		for (int i = 0; i < featureEls.getLength(); i++)
-		{
-			Element featureEl = (Element) featureEls.item(i);
-			String name = featureEl.getAttribute("name"); //$NON-NLS-1$
-			String type = featureEl.getAttribute("type"); //$NON-NLS-1$
-			String value = featureEl.getAttribute("value"); //$NON-NLS-1$
-			pdef.addFeature(new LaunchAttribute(name, type, value));
-		}
-
-		return pdef;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchHelper.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchHelper.java
deleted file mode 100644
index 7d79978..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchHelper.java
+++ /dev/null
@@ -1,399 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.config;
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.ServerSocket;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-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.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.variables.VariablesPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-import org.eclipse.wst.xsl.internal.launching.PreferenceUtil;
-import org.eclipse.wst.xsl.invoker.config.PipelineDefinition;
-import org.eclipse.wst.xsl.invoker.config.TransformDefinition;
-import org.eclipse.wst.xsl.invoker.config.TypedValue;
-import org.eclipse.wst.xsl.launching.IFeature;
-import org.eclipse.wst.xsl.launching.IOutputProperty;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.IProcessorType;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-import org.w3c.dom.Document;
-
-public class LaunchHelper
-{
-	private IPath sourceFile;
-	private final URL source;
-	private final File target;
-	private final LaunchFeatures features;
-	private final LaunchPipeline pipeline;
-	private final LaunchProperties outputProperties;
-	private int requestPort = -1;
-	private int eventPort = -1;
-	private final boolean openFileOnCompletion;
-
-	public LaunchHelper(ILaunchConfiguration configuration) throws CoreException
-	{
-		source = hydrateSourceFileURL(configuration);
-		target = hydrateOutputFile(configuration);
-		features = hydrateFeatures(configuration);
-		outputProperties = hydrateOutputProperties(configuration);
-		pipeline = hydratePipeline(configuration);
-		openFileOnCompletion = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_OPEN_FILE, true);
-	}
-
-	public int getRequestPort()
-	{
-		if (requestPort == -1)
-			requestPort = findFreePort();
-		return requestPort;
-	}
-
-	public int getEventPort()
-	{
-		if (eventPort == -1)
-			eventPort = findFreePort();
-		return eventPort;
-	}
-
-	public LaunchProperties getProperties()
-	{
-		return outputProperties;
-	}
-
-	public LaunchFeatures getFeatures()
-	{
-		return features;
-	}
-
-	public LaunchPipeline getPipeline()
-	{
-		return pipeline;
-	}
-
-	public URL getSource()
-	{
-		return source;
-	}
-
-	public File getTarget()
-	{
-		return target;
-	}
-
-	public void save(File file) throws CoreException
-	{
-		BufferedWriter writer = null;
-		try
-		{
-			// ensure it exists
-			file.createNewFile();
-			writer = new BufferedWriter(new FileWriter(file));
-			PipelineDefinition pdef = new PipelineDefinition();
-			for (Iterator<?> iter = features.getFeatures().iterator(); iter.hasNext();)
-			{
-				LaunchAttribute att = (LaunchAttribute) iter.next();
-				pdef.addFeature(new TypedValue(att.uri, att.type, att.value));
-			}
-			for (Iterator<?> iter = pipeline.getTransformDefs().iterator(); iter.hasNext();)
-			{
-				LaunchTransform lt = (LaunchTransform) iter.next();
-				TransformDefinition tdef = new TransformDefinition();
-				URL url = pathToURL(lt.getLocation());
-				tdef.setStylesheetURL(url.toExternalForm());
-				tdef.setResolverClass(lt.getResolver());
-				for (Iterator<?> iterator = lt.getParameters().iterator(); iterator.hasNext();)
-				{
-					LaunchAttribute att = (LaunchAttribute) iterator.next();
-					tdef.addParameter(new TypedValue(att.uri, att.type, att.getResolvedValue()));
-				}
-				// set the output props for the LAST transform only
-				if (!iter.hasNext())
-				{
-					for (Iterator<?> iterator = outputProperties.getProperties().entrySet().iterator(); iterator.hasNext();)
-					{
-						Map.Entry entry = (Map.Entry) iterator.next();
-						String name = (String) entry.getKey();
-						String value = (String) entry.getValue();
-						if (name != null && value != null)
-							tdef.setOutputProperty(name, value);
-					}
-				}
-				pdef.addTransformDef(tdef);
-			}
-
-			Document doc = pdef.toXML();
-			String s = PreferenceUtil.serializeDocument(doc);
-			writer.write(s);
-		}
-		catch (FileNotFoundException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.ERROR, Messages.getString("LaunchHelper.0"), e)); //$NON-NLS-1$
-		}
-		catch (IOException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.ERROR, Messages.getString("LaunchHelper.1"), e)); //$NON-NLS-1$
-		}
-		catch (ParserConfigurationException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.ERROR, "ParserConfigurationException", e)); //$NON-NLS-1$
-		}
-		catch (TransformerException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.ERROR, "TransformerException", e)); //$NON-NLS-1$
-		}
-		finally
-		{
-			if (writer != null)
-			{
-				try
-				{
-					writer.close();
-				}
-				catch (IOException e)
-				{
-					LaunchingPlugin.log(e);
-				}
-			}
-		}
-	}
-
-	private LaunchProperties hydrateOutputProperties(ILaunchConfiguration configuration) throws CoreException
-	{
-		LaunchProperties properties = null;
-		boolean usePreferenceProperties = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_PROPERTIES_FROM_PREFERENCES, true);
-		IProcessorType defaultType = XSLTRuntime.getJREDefaultProcessor().getProcessorType();
-		IProcessorType pt = getProcessorInstall(configuration).getProcessorType();
-		if (usePreferenceProperties)
-		{
-			properties = new LaunchProperties();
-			// get the standard properties
-			for (Object element : defaultType.getOutputPropertyValues().entrySet())
-			{
-				Map.Entry entry = (Map.Entry) element;
-				String name = (String) entry.getKey();
-				String value = (String) entry.getValue();
-				properties.setProperty(name, value);
-			}
-			// get the processor-specific properties
-			if (!pt.equals(defaultType))
-			{
-				for (Object element : pt.getOutputPropertyValues().entrySet())
-				{
-					Map.Entry entry = (Map.Entry) element;
-					String name = (String) entry.getKey();
-					String value = (String) entry.getValue();
-					properties.setProperty(name, value);
-				}
-			}
-		}
-		else
-		{
-			String s = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_PROPERTIES, (String) null);
-			if (s != null && s.length() > 0)
-			{
-				ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes());
-				properties = LaunchProperties.fromXML(inputStream);
-				// ensure all properties pertain to the current processor type
-				IOutputProperty[] defaultProps = defaultType.getOutputProperties();
-				IOutputProperty[] specificProps = pt.getOutputProperties();
-				IOutputProperty[] props = new IOutputProperty[specificProps.length + defaultProps.length];
-				System.arraycopy(specificProps, 0, props, 0, specificProps.length);
-				System.arraycopy(defaultProps, 0, props, specificProps.length, defaultProps.length);
-				for (Iterator<?> iterator = properties.getProperties().keySet().iterator(); iterator.hasNext();)
-				{
-					String key = (String) iterator.next();
-					boolean found = false;
-					for (IOutputProperty outputProperty : props)
-					{
-						if (outputProperty.getURI().equals(key))
-						{
-							found = true;
-						}
-					}
-					if (!found)
-						properties.removeProperty(key);
-				}
-			}
-		}
-		return properties;
-	}
-
-	private LaunchFeatures hydrateFeatures(ILaunchConfiguration configuration) throws CoreException
-	{
-		LaunchFeatures features = null;
-		boolean useDefaultFeatures = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_FEATURES_FROM_PREFERENCES, true);
-		if (useDefaultFeatures)
-		{
-			features = new LaunchFeatures();
-			IProcessorType pt = getProcessorInstall(configuration).getProcessorType();
-			Map<?, ?> fvals = pt.getFeatureValues();
-			for (Iterator<?> iter = fvals.entrySet().iterator(); iter.hasNext();)
-			{
-				Map.Entry entry = (Map.Entry) iter.next();
-				String uri = (String) entry.getKey();
-				IFeature feature = getFeature(pt.getFeatures(), uri);
-				features.addFeature(new LaunchAttribute(uri, feature.getType(), (String) entry.getValue()));
-			}
-		}
-		else
-		{
-			String s = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_FEATURES, (String) null);
-			if (s != null && s.length() > 0)
-			{
-				ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes());
-				features = LaunchFeatures.fromXML(inputStream);
-			}
-		}
-		return features;
-	}
-
-	private IFeature getFeature(IFeature[] features, String uri)
-	{
-		for (IFeature feature : features)
-		{
-			if (feature.getURI().equals(uri))
-				return feature;
-		}
-		return null;
-	}
-
-	private LaunchPipeline hydratePipeline(ILaunchConfiguration configuration) throws CoreException
-	{
-		LaunchPipeline pipeline = null;
-		String s = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PIPELINE, (String) null);
-		if (s != null && s.length() > 0)
-		{
-			ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes());
-			pipeline = LaunchPipeline.fromXML(inputStream);
-		}
-		return pipeline;
-	}
-
-	private URL hydrateSourceFileURL(ILaunchConfiguration configuration) throws CoreException
-	{
-		String sourceFileExpr = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, (String) null);
-		sourceFile = getSubstitutedPath(sourceFileExpr);
-		URL url = pathToURL(sourceFile);
-		return url;
-	}
-
-	private URL pathToURL(IPath sourceFile) throws CoreException
-	{
-		URL url = null;
-		try
-		{
-			url = sourceFile.toFile().toURL();
-		}
-		catch (MalformedURLException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.ERROR, sourceFile.toString(), e));
-		}
-		return url;
-	}
-
-	private File hydrateOutputFile(ILaunchConfiguration configuration) throws CoreException
-	{
-		IPath outputFile = null;
-		boolean useDefaultOutputFile = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_OUTPUT_FILE, true);
-		if (!useDefaultOutputFile)
-		{
-			String outputFileExpr = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_FILE, (String) null);
-			outputFile = getSubstitutedPath(outputFileExpr);
-		}
-		else
-		{
-			// TODO: where is the default output file? And must share this with
-			// the value displayed in the UI.
-			outputFile = (IPath) sourceFile.clone();
-			outputFile = outputFile.addFileExtension("out").addFileExtension("xml"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return outputFile.toFile();
-	}
-
-	private static IPath getSubstitutedPath(String path) throws CoreException
-	{
-		if (path != null)
-		{
-			path = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(path);
-			return new Path(path);
-		}
-		return null;
-	}
-
-	private IProcessorInstall getProcessorInstall(ILaunchConfiguration configuration) throws CoreException
-	{
-		boolean useDefaultProcessor = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, true);
-		if (useDefaultProcessor)
-			return XSLTRuntime.getDefaultProcessor();
-		String processorId = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_PROCESSOR, ""); //$NON-NLS-1$
-		IProcessorInstall processor = XSLTRuntime.getProcessor(processorId);
-		return processor;
-	}
-
-	/**
-	 * Returns a free port number on localhost, or -1 if unable to find a free
-	 * port.
-	 * 
-	 * @return a free port number on localhost, or -1 if unable to find a free
-	 *         port
-	 */
-	public static int findFreePort()
-	{
-		ServerSocket socket = null;
-		try
-		{
-			socket = new ServerSocket(0);
-			return socket.getLocalPort();
-		}
-		catch (IOException e)
-		{
-			LaunchingPlugin.log(e);
-		}
-		finally
-		{
-			if (socket != null)
-			{
-				try
-				{
-					socket.close();
-				}
-				catch (IOException e)
-				{
-					LaunchingPlugin.log(e);
-				}
-			}
-		}
-		return -1;
-	}
-
-	public boolean getOpenFileOnCompletion()
-	{
-		return openFileOnCompletion;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchPipeline.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchPipeline.java
deleted file mode 100644
index 4ba2983..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchPipeline.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.config;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-import org.eclipse.wst.xsl.internal.launching.PreferenceUtil;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class LaunchPipeline
-{
-	private List<LaunchTransform> transformDefs = new ArrayList<LaunchTransform>();
-	private final Properties outputProperties = new Properties();
-
-	public Properties getOutputProperties()
-	{
-		return outputProperties;
-	}
-
-	public void addOutputProperty(String name, String value)
-	{
-		outputProperties.put(name, value);
-	}
-
-	public List<LaunchTransform> getTransformDefs()
-	{
-		return transformDefs;
-	}
-
-	public void setTransformDefs(List<LaunchTransform> transforms)
-	{
-		transformDefs = transforms;
-	}
-
-	public void addTransformDef(LaunchTransform tdef)
-	{
-		tdef.setPipeline(this);
-		transformDefs.add(tdef);
-	}
-
-	public void removeTransformDef(LaunchTransform tdef)
-	{
-		transformDefs.remove(tdef);
-	}
-
-	public String toXML() throws CoreException
-	{
-		String xml = null;
-		try
-		{
-			Document doc = PreferenceUtil.getDocument();
-			Element rootEl = doc.createElement("Pipeline"); //$NON-NLS-1$
-			doc.appendChild(rootEl);
-
-			Element opEl = doc.createElement("OutputProperties"); //$NON-NLS-1$
-			rootEl.appendChild(opEl);
-			for (Object element : outputProperties.entrySet())
-			{
-				Map.Entry entry = (Map.Entry) element;
-				Element propEl = doc.createElement("Property"); //$NON-NLS-1$
-				propEl.setAttribute("name", (String) entry.getKey()); //$NON-NLS-1$
-				propEl.setAttribute("value", (String) entry.getValue()); //$NON-NLS-1$
-				opEl.appendChild(propEl);
-			}
-
-			for (Iterator<LaunchTransform> iter = transformDefs.iterator(); iter.hasNext();)
-			{
-				LaunchTransform tdef = (LaunchTransform) iter.next();
-				Element tdefEl = tdef.asXML(doc);
-				rootEl.appendChild(tdefEl);
-			}
-
-			xml = PreferenceUtil.serializeDocument(doc);
-		}
-		catch (DOMException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, 0, e.getMessage(), e));
-		}
-		catch (ParserConfigurationException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, 0, e.getMessage(), e));
-		}
-		catch (IOException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, 0, e.getMessage(), e));
-		}
-		catch (TransformerException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, 0, e.getMessage(), e));
-		}
-		return xml;
-	}
-
-	public static LaunchPipeline fromXML(InputStream inputStream) throws CoreException
-	{
-		Document doc = PreferenceUtil.getDocument(inputStream);
-
-		LaunchPipeline pdef = new LaunchPipeline();
-
-		Element rootEl = doc.getDocumentElement();
-
-		Element opEl = (Element) rootEl.getElementsByTagName("OutputProperties").item(0); //$NON-NLS-1$
-		if (opEl != null)
-		{
-			NodeList propEls = opEl.getElementsByTagName("Property"); //$NON-NLS-1$
-			for (int i = 0; i < propEls.getLength(); i++)
-			{
-				Element propEl = (Element) propEls.item(i);
-				String name = propEl.getAttribute("name"); //$NON-NLS-1$
-				String value = propEl.getAttribute("value"); //$NON-NLS-1$
-				pdef.addOutputProperty(name, value);
-			}
-		}
-
-		NodeList transformEls = rootEl.getElementsByTagName("Transform"); //$NON-NLS-1$
-		for (int i = 0; i < transformEls.getLength(); i++)
-		{
-			Element transformEl = (Element) transformEls.item(i);
-			LaunchTransform tdef = LaunchTransform.fromXML(transformEl);
-			pdef.addTransformDef(tdef);
-		}
-
-		return pdef;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchProperties.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchProperties.java
deleted file mode 100644
index 5cf0e6c..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchProperties.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.config;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xsl.internal.launching.PreferenceUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class LaunchProperties
-{
-	private final Map<String, String> properties = new HashMap<String, String>();
-
-	public Map<String, String> getProperties()
-	{
-		return properties;
-	}
-
-	public void setProperty(String name, String value)
-	{
-		properties.put(name, value);
-	}
-
-	public String getProperty(String name)
-	{
-		return (String) properties.get(name);
-	}
-
-	public void removeProperty(String name)
-	{
-		properties.remove(name);
-	}
-
-	public String toXML() throws ParserConfigurationException, IOException, TransformerException
-	{
-		Document doc = PreferenceUtil.getDocument();
-
-		Element featuresEl = doc.createElement("Properties"); //$NON-NLS-1$
-		doc.appendChild(featuresEl);
-
-		for (Iterator<?> iter = properties.entrySet().iterator(); iter.hasNext();)
-		{
-			Map.Entry entry = (Map.Entry) iter.next();
-			String name = (String) entry.getKey();
-			String value = (String) entry.getValue();
-			if (value == null)
-				continue;
-			Element featureEl = doc.createElement("Property"); //$NON-NLS-1$
-			featureEl.setAttribute("name", name); //$NON-NLS-1$
-			featureEl.setAttribute("value", value); //$NON-NLS-1$
-			featuresEl.appendChild(featureEl);
-		}
-
-		return PreferenceUtil.serializeDocument(doc);
-	}
-
-	public static LaunchProperties fromXML(InputStream inputStream) throws CoreException
-	{
-		Document doc = PreferenceUtil.getDocument(inputStream);
-
-		LaunchProperties pdef = new LaunchProperties();
-
-		Element featuresEl = doc.getDocumentElement();
-
-		NodeList featureEls = featuresEl.getElementsByTagName("Property"); //$NON-NLS-1$
-		for (int i = 0; i < featureEls.getLength(); i++)
-		{
-			Element featureEl = (Element) featureEls.item(i);
-			String name = featureEl.getAttribute("name"); //$NON-NLS-1$
-			String value = featureEl.getAttribute("value"); //$NON-NLS-1$
-			pdef.setProperty(name, value);
-		}
-
-		return pdef;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchTransform.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchTransform.java
deleted file mode 100644
index e7ea6b8..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/LaunchTransform.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.config;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-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.core.variables.VariablesPlugin;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class LaunchTransform
-{
-	public static final String RESOURCE_TYPE = "resource"; //$NON-NLS-1$
-	public static final String EXTERNAL_TYPE = "external"; //$NON-NLS-1$
-
-	private final String stylesheet;
-	private final String pathType;
-	private String resolver;
-	private final Set<LaunchAttribute> parameters = new HashSet<LaunchAttribute>();
-	private LaunchPipeline pipeline;
-
-	/**
-	 * The path may be an IResource to a file in the workspace, or an IPath to a
-	 * file outside of the workspace - depending on the pathType. The path
-	 * should be created using IPath.toPortableString(). The path may also
-	 * contain variables defined by the VariablePlugin.
-	 * 
-	 * @param path
-	 * @param pathType
-	 */
-	public LaunchTransform(String path, String pathType)
-	{
-		stylesheet = path;
-		this.pathType = pathType;
-	}
-
-	public Set<LaunchAttribute> getParameters()
-	{
-		return parameters;
-	}
-	
-	public void addParameter(LaunchAttribute parameter)
-	{
-		parameters.add(parameter);
-	}
-
-	public String getResolver()
-	{
-		return resolver;
-	}
-
-	public void setResolver(String resolver)
-	{
-		this.resolver = resolver;
-	}
-
-	public IPath getPath() throws CoreException
-	{
-		String substitutedValue = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(stylesheet);
-		return Path.fromPortableString(substitutedValue);
-	}
-
-	public String getPathType()
-	{
-		return pathType;
-	}
-
-	/**
-	 * The full path to the file in the local file system (with any string
-	 * subsitutions already made).
-	 * 
-	 * @return
-	 * @throws CoreException
-	 */
-	public IPath getLocation() throws CoreException
-	{
-		IPath partialPath = getPath();
-		IPath fullPath = null;
-		if (RESOURCE_TYPE.equals(pathType))
-		{
-			IFile file = (IFile) ResourcesPlugin.getWorkspace().getRoot().findMember(partialPath);
-			fullPath = file.getLocation();
-		}
-		else if (EXTERNAL_TYPE.equals(pathType))
-		{
-			fullPath = partialPath;
-		}
-		return fullPath;
-	}
-
-	public Element asXML(Document doc)
-	{
-		Element tdefEl = doc.createElement("Transform"); //$NON-NLS-1$
-		tdefEl.setAttribute("path", stylesheet); //$NON-NLS-1$
-		tdefEl.setAttribute("pathType", pathType); //$NON-NLS-1$
-		if (resolver != null)
-			tdefEl.setAttribute("uriResolver", resolver); //$NON-NLS-1$
-		Element paramsEl = doc.createElement("Parameters"); //$NON-NLS-1$
-		tdefEl.appendChild(paramsEl);
-		for (Iterator<LaunchAttribute> iter = parameters.iterator(); iter.hasNext();)
-		{
-			LaunchAttribute param = (LaunchAttribute) iter.next();
-			Element propEl = doc.createElement("Parameter"); //$NON-NLS-1$
-			propEl.setAttribute("name", param.uri); //$NON-NLS-1$
-			propEl.setAttribute("type", param.type); //$NON-NLS-1$
-			propEl.setAttribute("value", param.value); //$NON-NLS-1$
-			paramsEl.appendChild(propEl);
-		}
-		return tdefEl;
-	}
-
-	public static LaunchTransform fromXML(Element transformEl)
-	{
-		String path = transformEl.getAttribute("path"); //$NON-NLS-1$
-		String pathType = transformEl.getAttribute("pathType"); //$NON-NLS-1$
-
-		LaunchTransform tdef = new LaunchTransform(path, pathType);
-
-		String uriResolver = transformEl.getAttribute("uriResolver"); //$NON-NLS-1$
-		tdef.setResolver(uriResolver);
-
-		Element paramsEl = (Element) transformEl.getElementsByTagName("Parameters").item(0); //$NON-NLS-1$
-		NodeList paramEls = paramsEl.getElementsByTagName("Parameter"); //$NON-NLS-1$
-		for (int i = 0; i < paramEls.getLength(); i++)
-		{
-			Element paramEl = (Element) paramEls.item(i);
-			String name = paramEl.getAttribute("name"); //$NON-NLS-1$
-			String type = paramEl.getAttribute("type"); //$NON-NLS-1$
-			String value = paramEl.getAttribute("value"); //$NON-NLS-1$
-			tdef.addParameter(new LaunchAttribute(name, type, value));
-		}
-
-		return tdef;
-	}
-
-	public void setPipeline(LaunchPipeline pipeline)
-	{
-		this.pipeline = pipeline;
-	}
-
-	public LaunchPipeline getPipeline()
-	{
-		return pipeline;
-	}
-
-	/*
-	 * private File getURIResolverDirectory(ILaunchConfiguration configuration)
-	 * throws CoreException { File resolverDir = null; String baseURIType =
-	 * configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_BASE_URI_TYPE,
-	 * XSLLaunchConfigurationConstants.BASE_URI_WORKING_DIR_RELATIVE); if
-	 * (XSLLaunchConfigurationConstants.BASE_URI_ABSOLUTE.equals(baseURIType)) {
-	 * String uriDir =
-	 * configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_BASE_URI_DIRECTORY,
-	 * (String)null); if (uriDir!=null) { String pathExpr =
-	 * VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(uriDir);
-	 * Path path = new Path(pathExpr); if (path.isAbsolute()) { File dir = new
-	 * File(path.toOSString()); if (dir.isDirectory() && dir.exists()) { return
-	 * dir; } // This may be a workspace relative path returned by a variable. //
-	 * However variable paths start with a slash and thus are thought to // be
-	 * absolute, so fall through to below } IResource res =
-	 * ResourcesPlugin.getWorkspace().getRoot().findMember(path); if (res
-	 * instanceof IContainer && res.exists()) return res.getLocation().toFile();
-	 * abort("URI path is invalid",null,0); } } else if
-	 * (XSLLaunchConfigurationConstants.BASE_URI_STYLESHEET_RELATIVE.equals(baseURIType)) {
-	 * resolverDir = getStylesheetRelativeURIResolver(configuration); } // no
-	 * need to handle the case of working_dir relative - this is the default for
-	 * JAXP so return null return resolverDir; }
-	 * 
-	 * private File getStylesheetRelativeURIResolver(ILaunchConfiguration
-	 * configuration) throws CoreException { List stylesheets =
-	 * configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_STYLESHEETS_LIST,(List)null);
-	 * if (stylesheets == null || stylesheets.size() == 0) abort("No stylesheets
-	 * defined for this launch configuration", null, 0); else { String sheet =
-	 * (String)stylesheets.get(0); String pathExpr =
-	 * VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(sheet);
-	 * Path path = new Path(pathExpr); if (path.isAbsolute()) { File file = new
-	 * File(path.toOSString()); if (file.exists()) { File dir =
-	 * file.getParentFile(); return dir; } // This may be a workspace relative
-	 * path returned by a variable. // However variable paths start with a slash
-	 * and thus are thought to // be absolute IResource res =
-	 * ResourcesPlugin.getWorkspace().getRoot().findMember(path); IContainer
-	 * parent = res.getParent(); if (parent.exists()) return
-	 * parent.getLocation().toFile(); abort("Stylesheet path is
-	 * invalid",null,0); } else { IResource res =
-	 * ResourcesPlugin.getWorkspace().getRoot().findMember(path); IContainer
-	 * parent = res.getParent(); if (parent.exists()) return
-	 * parent.getLocation().toFile(); abort("Stylesheet path is
-	 * invalid",null,0); } } return null; }
-	 */
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/Messages.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/Messages.java
deleted file mode 100644
index c62e7c0..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.launching.config;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.launching.config.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/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/messages.properties b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/messages.properties
deleted file mode 100644
index f08087e..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/config/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-LaunchHelper.0=File not found
-LaunchHelper.1=IO Exception
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/messages.properties b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/messages.properties
deleted file mode 100644
index d75ea07..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/messages.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-XSLTRuntime.10=Failed to save process preferences
-XSLTRuntime.5=Saving features...
-XSLTRuntime.6=Failed to save feature preferences
-XSLTRuntime.7=Saving properties...
-XSLTRuntime.8=Failed to save output property preferences
-XSLTRuntime.9=Saving processors...
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/IXSLConstants.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/IXSLConstants.java
deleted file mode 100644
index 1fa47da..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/IXSLConstants.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.model;
-
-public interface IXSLConstants
-{
-
-	public static final String ID_XSL_DEBUG_MODEL = "org.eclipse.wst.xsl.launching.XSLDebugModel"; //$NON-NLS-1$
-	public static final String MARKER_ID = "org.eclipse.wst.xsl.launching.xslLineBreakpointMarker"; //$NON-NLS-1$
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/IXSLDebugTarget.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/IXSLDebugTarget.java
deleted file mode 100644
index 3e9e554..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/IXSLDebugTarget.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.wst.xsl.launching.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IValue;
-
-public interface IXSLDebugTarget extends IDebugTarget
-{
-	XSLVariable getVariable(int varId) throws DebugException;
-
-	IStackFrame[] getStackFrames() throws DebugException;
-
-	void stepInto() throws DebugException;
-
-	void stepOver() throws DebugException;
-
-	void stepReturn() throws DebugException;
-
-	IValue getVariableValue(XSLVariable variable) throws DebugException;	
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/Messages.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/Messages.java
deleted file mode 100644
index 0e9a27a..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.launching.model;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.launching.model.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/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLDebugElement.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLDebugElement.java
deleted file mode 100644
index 5576c6e..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLDebugElement.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.DebugElement;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IDisconnect;
-import org.eclipse.debug.core.model.ITerminate;
-
-public abstract class XSLDebugElement extends DebugElement implements IDisconnect
-{
-	public XSLDebugElement(IDebugTarget target)
-	{
-		super(target);
-	}
-
-	public String getModelIdentifier()
-	{
-		return IXSLConstants.ID_XSL_DEBUG_MODEL;
-	}
-	
-	@SuppressWarnings("unchecked") //$NON-NLS-1$
-	@Override
-	public Object getAdapter(Class adapter) {
-		if (adapter == ITerminate.class) {
-			return getDebugTarget();
-		}
-		return super.getAdapter(adapter);
-	}
-	
-	public boolean canDisconnect()
-	{
-		return getDebugTarget().canDisconnect();
-	}
-	
-	public void disconnect() throws DebugException
-	{
-		getDebugTarget().disconnect();
-	}
-	
-	public boolean isDisconnected()
-	{
-		return getDebugTarget().isDisconnected();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLDebugTarget.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLDebugTarget.java
deleted file mode 100644
index 2614781..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLDebugTarget.java
+++ /dev/null
@@ -1,723 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.model;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.ConnectException;
-import java.net.MalformedURLException;
-import java.net.Socket;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-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.Status;
-import org.eclipse.core.runtime.jobs.Job;
-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.ILaunchManager;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.ILineBreakpoint;
-import org.eclipse.debug.core.model.IMemoryBlock;
-import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.wst.xsl.debugger.DebugConstants;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-import org.eclipse.wst.xsl.internal.launching.XSLTLaunchConfigurationDelegate;
-import org.eclipse.wst.xsl.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.launching.config.LaunchHelper;
-
-public class XSLDebugTarget extends XSLDebugElement implements IXSLDebugTarget
-{
-	private final byte[] STACK_FRAMES_LOCK = new byte[0];
-	private final byte[] VALUE_MAP_LOCK = new byte[0];
-	private final byte[] WRITE_LOCK = new byte[0];
-
-	private final int CONNECT_ATTEMPTS = 10;
-	private final int CONNECT_WAIT = 1000;
-
-	private final IProcess process;
-	private final ILaunch launch;
-	private XSLThread thread;
-	private IThread[] threads;
-	private IStackFrame[] stackFramesCache = new IStackFrame[0];
-
-	private EventDispatchJob eventDispatch;
-
-	private final Map<Integer,XSLVariable> variableMapCache = new HashMap<Integer, XSLVariable>();
-	private final Map<XSLVariable, XSLValue> valueMapCache = new HashMap<XSLVariable, XSLValue>();
-	private String name;
-	private boolean suspended;
-	private boolean terminated;
-
-	private Socket requestSocket;
-	private Socket eventSocket;
-	private BufferedReader requestReader;
-	private BufferedReader eventReader;
-	private PrintWriter requestWriter;
-	private boolean stale;
-
-	public XSLDebugTarget(ILaunch launch, IProcess process, LaunchHelper launchHelper) throws CoreException
-	{
-		super(null);
-		this.launch = launch;
-		this.process = process;
-		this.requestSocket = attemptConnect(launchHelper.getRequestPort());
-		this.eventSocket = attemptConnect(launchHelper.getEventPort());
-
-		if (!process.isTerminated())
-		{
-			try
-			{
-				this.eventReader = new BufferedReader(new InputStreamReader(eventSocket.getInputStream()));
-				this.requestWriter = new PrintWriter(requestSocket.getOutputStream());
-				this.requestReader = new BufferedReader(new InputStreamReader(requestSocket.getInputStream()));
-			}
-			catch (IOException e)
-			{
-				abort(Messages.getString("XSLDebugTarget.0"), e); //$NON-NLS-1$
-			}
-			this.thread = new XSLThread(this);
-			this.threads = new IThread[]{ thread };
-			this.eventDispatch = new EventDispatchJob();
-			this.eventDispatch.schedule();
-	
-			DebugPlugin.getDefault().getBreakpointManager().addBreakpointListener(this);
-		}
-	}
-
-    private void abort(String message, Throwable e) throws DebugException
-	{
-		if (!getDebugTarget().isTerminated())
-			getDebugTarget().getProcess().terminate();
-		throw new DebugException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, DebugPlugin.INTERNAL_ERROR, message, e));
-	}
-	
-	private Socket attemptConnect(int port) throws CoreException
-	{
-		Socket socket = null;
-		for(int i=0;i<CONNECT_ATTEMPTS;i++)
-		{	
-			// break out if process is terminated
-			if (process.isTerminated())
-				break;
-			try
-			{
-				socket = new Socket(Messages.getString("XSLDebugTarget.1"),port); //$NON-NLS-1$
-			}
-			catch (ConnectException e)
-			{}
-			catch (IOException e)
-			{}
-			if (socket != null)
-				break;
-			try
-			{
-				Thread.sleep(CONNECT_WAIT);
-			}
-			catch (InterruptedException e)
-			{}
-		}
-		if (socket == null && !process.isTerminated())
-			throw new CoreException(new Status(Status.ERROR, LaunchingPlugin.PLUGIN_ID, Messages.getString("XSLDebugTarget.2")+port+Messages.getString("XSLDebugTarget.3")+CONNECT_ATTEMPTS+Messages.getString("XSLDebugTarget.4"))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return socket;
-	}
-
-	public IProcess getProcess()
-	{
-		return process;
-	}
-
-	public IThread[] getThreads() throws DebugException
-	{
-		return threads;
-	}
-
-	public boolean hasThreads() throws DebugException
-	{
-		return threads != null && threads.length > 0;
-	}
-
-	public String getName() throws DebugException
-	{
-		if (name == null)
-		{
-			try
-			{
-				IProcessorInstall install = XSLTLaunchConfigurationDelegate.getProcessorInstall(getLaunch().getLaunchConfiguration(), ILaunchManager.DEBUG_MODE);
-				String type = install.getProcessorType().getLabel();
-				name = type + " [" + install.getName() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			catch (CoreException e)
-			{
-				throw new DebugException(e.getStatus());
-			}
-		}
-		return name;
-	}
-
-	public boolean supportsBreakpoint(IBreakpoint breakpoint)
-	{
-		if (breakpoint.getModelIdentifier().equals(IXSLConstants.ID_XSL_DEBUG_MODEL) && breakpoint instanceof ILineBreakpoint)
-		{
-//			try
-//			{
-//				ILineBreakpoint lb = (ILineBreakpoint) breakpoint;
-//				IMarker marker = lb.getMarker();
-//				for (Iterator<?> iter = launchHelper.getPipeline().getTransformDefs().iterator(); iter.hasNext();)
-//				{
-//					LaunchTransform lt = (LaunchTransform) iter.next();
-//					if (marker.getResource().getLocation().equals(lt.getLocation()))
-//						return true;
-//				}
-//			}
-//			catch (CoreException e)
-//			{
-//				LaunchingPlugin.log(e);
-//			}
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public IDebugTarget getDebugTarget()
-	{
-		return this;
-	}
-
-	@Override
-	public ILaunch getLaunch()
-	{
-		return launch;
-	}
-
-	public boolean canTerminate()
-	{
-		return getProcess().canTerminate();
-	}
-
-	public boolean isTerminated()
-	{
-		return terminated;
-	}
-
-	public void terminate() throws DebugException
-	{
-		synchronized (WRITE_LOCK)
-		{
-			getProcess().terminate();
-		}
-	}
-
-	public boolean canResume()
-	{
-		return !isTerminated() && isSuspended();
-	}
-
-	public boolean canSuspend()
-	{
-		return !isTerminated() && !isSuspended();
-	}
-
-	public boolean isSuspended()
-	{
-		return suspended;
-	}
-
-	public void resume() throws DebugException
-	{
-		sendRequest(DebugConstants.REQUEST_RESUME);
-	}
-
-	private void resumed(int detail)
-	{
-		suspended = false;
-		thread.fireResumeEvent(detail);
-	}
-
-	private void suspended(int detail)
-	{
-		suspended = true;
-		thread.fireSuspendEvent(detail);
-	}
-
-	public void suspend() throws DebugException
-	{
-		sendRequest(DebugConstants.REQUEST_SUSPEND);
-	}
-
-	public void breakpointAdded(IBreakpoint breakpoint)
-	{
-		if (supportsBreakpoint(breakpoint))
-		{
-			try
-			{
-				ILineBreakpoint lb = (ILineBreakpoint) breakpoint;
-				if (breakpoint.isEnabled())
-				{
-					try
-					{
-						IMarker marker = lb.getMarker();
-						if (marker != null)
-						{
-							URL file = marker.getResource().getLocation().toFile().toURI().toURL();
-							sendRequest(DebugConstants.REQUEST_ADD_BREAKPOINT + " " + file + " " + lb.getLineNumber()); //$NON-NLS-1$ //$NON-NLS-2$
-						}
-					}
-					catch (CoreException e)
-					{
-						LaunchingPlugin.log(e);
-					}
-					catch (MalformedURLException e)
-					{
-						LaunchingPlugin.log(e);
-					}
-				}
-			}
-			catch (CoreException e)
-			{
-			}
-		}
-	}
-
-	public void breakpointRemoved(IBreakpoint breakpoint, IMarkerDelta delta)
-	{
-		if (supportsBreakpoint(breakpoint))
-		{
-			try
-			{
-				ILineBreakpoint lb = (ILineBreakpoint) breakpoint;
-				IMarker marker = lb.getMarker();
-				if (marker != null)
-				{
-					URL file = marker.getResource().getLocation().toFile().toURI().toURL();
-					sendRequest(DebugConstants.REQUEST_REMOVE_BREAKPOINT + " " + file + " " + lb.getLineNumber()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			catch (CoreException e)
-			{
-				LaunchingPlugin.log(e);
-			}
-			catch (MalformedURLException e)
-			{
-				LaunchingPlugin.log(e);
-			}
-		}
-	}
-
-	public void breakpointChanged(IBreakpoint breakpoint, IMarkerDelta delta)
-	{
-		if (supportsBreakpoint(breakpoint))
-		{
-			try
-			{
-				if (breakpoint.isEnabled())
-				{
-					breakpointAdded(breakpoint);
-				}
-				else
-				{
-					breakpointRemoved(breakpoint, null);
-				}
-			}
-			catch (CoreException e)
-			{
-			}
-		}
-	}
-
-	public boolean canDisconnect()
-	{
-		// TODO implement disconnect
-		return false;
-	}
-
-	public void disconnect() throws DebugException
-	{
-		// TODO implement disconnect
-	}
-
-	public boolean isDisconnected()
-	{
-		// TODO implement disconnect
-		return false;
-	}
-
-	public boolean supportsStorageRetrieval()
-	{
-		return false;
-	}
-
-	public IMemoryBlock getMemoryBlock(long startAddress, long length) throws DebugException
-	{
-		return null;
-	}
-
-	private void ready()
-	{
-		fireCreationEvent();
-		installDeferredBreakpoints();
-		try
-		{
-			sendRequest(DebugConstants.REQUEST_START);
-		}
-		catch (DebugException e)
-		{
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Install breakpoints that are already registered with the breakpoint
-	 * manager.
-	 */
-	private void installDeferredBreakpoints()
-	{
-		IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(IXSLConstants.ID_XSL_DEBUG_MODEL);
-		for (IBreakpoint element : breakpoints)
-		{
-			breakpointAdded(element);
-		}
-	}
-
-	private void terminated()
-	{
-		terminated = true;
-		suspended = true;
-		DebugPlugin.getDefault().getBreakpointManager().removeBreakpointListener(this);
-
-		threads = new IThread[0];
-
-		fireTerminateEvent();
-	}
-
-	/**
-	 * Returns the current stack frames in the target.
-	 */
-	public IStackFrame[] getStackFrames() throws DebugException
-	{
-		synchronized (STACK_FRAMES_LOCK)
-		{
-			if (stale)
-			{
-				stale = false;
-				String framesData = sendRequest(DebugConstants.REQUEST_STACK);
-				String[] frames = framesData.split("\\$\\$\\$"); //$NON-NLS-1$
-				IStackFrame[] sf = new IStackFrame[frames.length];
-				List<IStackFrame> currentFrames = Arrays.asList(stackFramesCache);
-				for (int i = 0; i < frames.length; i++)
-				{
-					String data = frames[i];
-					XSLStackFrame frame = new XSLStackFrame(thread, data, i);
-					int index;
-					if ((index = currentFrames.indexOf(frame)) != -1)
-					{
-						XSLStackFrame curr = (XSLStackFrame)currentFrames.get(index);
-						curr.setLineNumber(frame.getLineNumber());
-						curr.setVariables(frame.getVariables());
-						frame = curr;
-					}
-					sf[frames.length - i - 1] = frame;
-				}
-				stackFramesCache = sf;
-			}
-			return stackFramesCache;
-		}
-	}
-	
-/*
-	private void init(String data)
-	{
-
-		String[] strings = data.split("\\|");
-		String fileName = strings[0];
-		try
-		{
-			URL url = new URL(fileName);
-			Path p = new Path(url.getFile());
-			xslFileName = (new Path(fileName)).lastSegment();
-
-			String idString = strings[1];
-			id = Integer.parseInt(idString);
-			String pc = strings[2];
-			lineNumber = Integer.parseInt(pc);
-			String safename = strings[3];
-
-			int theIndex;
-			while ((theIndex = safename.indexOf("%@_PIPE_@%")) != -1)
-			{
-				safename = safename.substring(0, theIndex) + "|" + safename.substring(theIndex + "%@_PIPE_@%".length(), safename.length());
-			}
-
-			name = p.lastSegment() + " " + safename;
-
-			int numVars = strings.length - 4;
-			variables = new IVariable[numVars];
-			for (int i = 0; i < numVars; i++)
-			{
-				String val = strings[i + 4];
-				int index = val.lastIndexOf('&');
-				int slotNumber = Integer.parseInt(val.substring(index + 1));
-				val = val.substring(0, index);
-				index = val.lastIndexOf('&');
-				String name = val.substring(0, index);
-				String scope = val.substring(index + 1);
-				variables[i] = new XSLVariable(this, scope, name, slotNumber);
-			}
-		}
-		catch (MalformedURLException e)
-		{
-			LaunchingPlugin.log(e);
-		}
-	}
-*/
-
-	private void ressetStackFramesCache()
-	{
-		stale = true;
-		synchronized (VALUE_MAP_LOCK)
-		{
-			valueMapCache.clear();
-		}
-	}
-
-	/**
-	 * Single step the interpreter.
-	 */
-	public void stepOver() throws DebugException
-	{
-		sendRequest(DebugConstants.REQUEST_STEP_OVER);
-	}
-
-	public void stepInto() throws DebugException
-	{
-		sendRequest(DebugConstants.REQUEST_STEP_INTO);
-	}
-
-	public void stepReturn() throws DebugException
-	{
-		sendRequest(DebugConstants.REQUEST_STEP_RETURN);
-	}
-
-	public XSLVariable getVariable(int varId) throws DebugException
-	{
-		synchronized (variableMapCache)
-		{
-			XSLVariable var = variableMapCache.get(varId);
-			if (var == null)
-			{
-				var = new XSLVariable(this,varId);
-				String res = sendRequest(DebugConstants.REQUEST_VARIABLE + " " + varId); //$NON-NLS-1$
-				String[] data = res.split("&"); //$NON-NLS-1$
-				var.setScope(data[0]);
-				var.setName(data[1]);
-				variableMapCache.put(varId,var);
-			}
-			return var;
-		}
-	}
-
-	public IValue getVariableValue(XSLVariable variable) throws DebugException
-	{
-		synchronized (VALUE_MAP_LOCK)
-		{
-			XSLValue value = (XSLValue) valueMapCache.get(variable);
-			if (value == null)
-			{
-				if (isSuspended())
-				{
-					String res = sendRequest(DebugConstants.REQUEST_VALUE + " " + variable.getId()); //$NON-NLS-1$
-					String[] data = res.split("&"); //$NON-NLS-1$
-					String type = data[0];
-					String theval;
-					if (data.length > 1)
-						theval = data[1];
-					else
-						theval = ""; //$NON-NLS-1$
-					value = new XSLValue(this, type, theval);
-					valueMapCache.put(variable, value);
-				}
-				else
-				{
-					// anything as long as not null!
-					value = new XSLValue(this, "G", ""); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			return value;
-		}
-	}
-
-	private String sendRequest(String request) throws DebugException
-	{
-		String response = null;
-		synchronized (WRITE_LOCK)
-		{
-			// System.out.println("REQUEST: " + request);
-			requestWriter.println(request);
-			requestWriter.flush();
-			try
-			{
-				// wait for response
-				response = requestReader.readLine();
-				// System.out.println("RESPONSE: " + response);
-			}
-			catch (IOException e)
-			{
-				abort(Messages.getString("XSLDebugTarget.19") + request, e); //$NON-NLS-1$
-			}
-		}
-		return response;
-	}
-
-	private void breakpointHit(String event)
-	{
-		// determine which breakpoint was hit, and set the thread's breakpoint
-		int lastSpace = event.lastIndexOf(' ');
-		if (lastSpace > 0)
-		{
-			String line = event.substring(lastSpace + 1);
-			int lineNumber = Integer.parseInt(line);
-			IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints(IXSLConstants.ID_XSL_DEBUG_MODEL);
-			for (IBreakpoint breakpoint : breakpoints)
-			{
-				if (supportsBreakpoint(breakpoint))
-				{
-					if (breakpoint instanceof ILineBreakpoint)
-					{
-						ILineBreakpoint lineBreakpoint = (ILineBreakpoint) breakpoint;
-						try
-						{
-							if (lineBreakpoint.getLineNumber() == lineNumber)
-							{
-								thread.setBreakpoints(new IBreakpoint[]{ breakpoint });
-								break;
-							}
-						}
-						catch (CoreException e)
-						{
-						}
-					}
-				}
-			}
-		}
-		suspended(DebugEvent.BREAKPOINT);
-	}
-
-	private class EventDispatchJob extends Job
-	{
-
-		public EventDispatchJob()
-		{
-			super(Messages.getString("XSLDebugTarget.20")); //$NON-NLS-1$
-			setSystem(true);
-		}
-
-		@Override
-		protected IStatus run(IProgressMonitor monitor)
-		{
-			String event = ""; //$NON-NLS-1$
-			while (!isTerminated() && event != null)
-			{
-				try
-				{
-					event = eventReader.readLine();
-					if (event != null)
-					{
-						thread.setBreakpoints(null);
-						thread.setStepping(false);
-						if (event.equals("ready")) //$NON-NLS-1$
-						{
-							ready();
-						}
-						else if (event.equals("stopped")) //$NON-NLS-1$
-						{
-							try
-							{
-								terminate();
-							}
-							catch (DebugException e)
-							{
-							}
-						}
-						else if (event.equals("terminated")) //$NON-NLS-1$
-						{
-							terminated();
-						}
-						else if (event.startsWith("resumed")) //$NON-NLS-1$
-						{
-							if (event.endsWith("step")) //$NON-NLS-1$
-							{
-								thread.setStepping(true);
-								resumed(DebugEvent.STEP_OVER);
-							}
-							else if (event.endsWith("client")) //$NON-NLS-1$
-							{
-								resumed(DebugEvent.CLIENT_REQUEST);
-							}
-							else
-							{
-								// System.out.println("Did not understand event:
-								// " + event);
-							}
-						}
-						else if (event.startsWith("suspended")) //$NON-NLS-1$
-						{
-							// clear down the frames so that they are re-fetched
-							ressetStackFramesCache();
-							if (event.endsWith("client")) //$NON-NLS-1$
-							{
-								suspended(DebugEvent.CLIENT_REQUEST);
-							}
-							else if (event.endsWith("step")) //$NON-NLS-1$
-							{
-								suspended(DebugEvent.STEP_END);
-							}
-							else if (event.indexOf("breakpoint") >= 0) //$NON-NLS-1$
-							{
-								breakpointHit(event);
-							}
-							else
-							{
-								// System.out.println("Did not understand event:
-								// " + event);
-							}
-						}
-						else
-						{
-							// System.out.println("Did not understand event: " +
-							// event);
-						}
-					}
-				}
-				catch (IOException e)
-				{
-					terminated();
-				}
-			}
-			return Status.OK_STATUS;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLLineBreakpoint.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLLineBreakpoint.java
deleted file mode 100644
index 657e2a8..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLLineBreakpoint.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation 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:
- *     IBM Corporation - initial API and implementation
- *     Bjorn Freeman-Benson - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.model;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.core.model.LineBreakpoint;
-
-public class XSLLineBreakpoint extends LineBreakpoint
-{
-	private int lineNumber;
-
-	public XSLLineBreakpoint()
-	{
-	}
-
-	public XSLLineBreakpoint(final IResource resource, final int lineNumber, final int charStart, final int charEnd) throws CoreException
-	{
-		this.lineNumber = lineNumber;
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable()
-		{
-			public void run(IProgressMonitor monitor) throws CoreException
-			{
-				IMarker marker = resource.createMarker(IXSLConstants.MARKER_ID);
-				setMarker(marker);
-				marker.setAttribute(IBreakpoint.ID, getModelIdentifier());
-				marker.setAttribute(IBreakpoint.ENABLED, Boolean.TRUE);
-				marker.setAttribute(IMarker.MESSAGE, Messages.getString("XSLLineBreakpoint.0") + resource.getName() + " [line: " + lineNumber + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-				marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
-				marker.setAttribute(IMarker.CHAR_START, new Integer(charStart));
-				marker.setAttribute(IMarker.CHAR_END, new Integer(charEnd));
-
-				register(true);
-			}
-		};
-		run(getMarkerRule(resource), runnable);
-	}
-
-	@Override
-	public int getLineNumber() throws CoreException
-	{
-		int line = super.getLineNumber();
-		return line == -1 ? lineNumber : line;
-	}
-
-	protected void register(boolean register) throws CoreException
-	{
-		DebugPlugin plugin = DebugPlugin.getDefault();
-		if (plugin != null && register)
-		{
-			plugin.getBreakpointManager().addBreakpoint(this);
-		}
-		else
-		{
-			setRegistered(false);
-		}
-	}
-
-	public String getModelIdentifier()
-	{
-		return IXSLConstants.ID_XSL_DEBUG_MODEL;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLStackFrame.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLStackFrame.java
deleted file mode 100644
index 7a49a26..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLStackFrame.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.model;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IRegisterGroup;
-import org.eclipse.debug.core.model.IStackFrame;
-import org.eclipse.debug.core.model.IThread;
-import org.eclipse.debug.core.model.IVariable;
-import org.eclipse.wst.xsl.internal.launching.LaunchingPlugin;
-
-/**
- * XSL stack frame.
- */
-public class XSLStackFrame extends XSLDebugElement implements IStackFrame
-{
-	private final XSLThread xslThread;
-	private int id;
-	private String name;
-	private int lineNumber;
-	private String xslFileName;
-	private IVariable[] variables;
-
-	public XSLStackFrame(XSLThread thread, String data, int index)
-	{
-		super(thread.getDebugTarget());
-		this.xslThread = thread;
-		init(data,(IXSLDebugTarget) thread.getDebugTarget());
-	}
-
-	private void init(String data,IXSLDebugTarget debugTarget)
-	{
-
-		String[] strings = data.split("\\|"); //$NON-NLS-1$
-		String fileName = strings[0];
-		try
-		{
-			URL url = new URL(fileName);
-			Path p = new Path(url.getFile());
-			xslFileName = (new Path(fileName)).lastSegment();
-
-			String idString = strings[1];
-			id = Integer.parseInt(idString);
-			String pc = strings[2];
-			lineNumber = Integer.parseInt(pc);
-			String safename = strings[3];
-
-			int theIndex;
-			while ((theIndex = safename.indexOf("%@_PIPE_@%")) != -1) //$NON-NLS-1$
-			{
-				safename = safename.substring(0, theIndex) + "|" + safename.substring(theIndex + "%@_PIPE_@%".length(), safename.length()); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			name = p.lastSegment() + " " + safename; //$NON-NLS-1$
-			
-			variables = new XSLVariable[strings.length-4];
-			for (int i=0;i<variables.length;i++)
-			{
-				int varId = Integer.parseInt(strings[i+4]);
-				try
-				{
-					XSLVariable var = debugTarget.getVariable(varId);
-					variables[i] = var;
-				}
-				catch (DebugException e)
-				{
-					LaunchingPlugin.log(e);
-				}
-			}
-		}
-		catch (MalformedURLException e)
-		{
-			LaunchingPlugin.log(e);
-		}
-	}
-
-	public IThread getThread()
-	{
-		return xslThread;
-	}
-
-	public IVariable[] getVariables() throws DebugException
-	{
-		return variables;
-	}
-
-	public boolean hasVariables() throws DebugException
-	{
-		return variables.length > 0;
-	}
-
-	public int getLineNumber() throws DebugException
-	{
-		return lineNumber;
-	}
-
-	public int getCharStart() throws DebugException
-	{
-		return -1;
-	}
-
-	public int getCharEnd() throws DebugException
-	{
-		return -1;
-	}
-
-	public String getName() throws DebugException
-	{
-		return name + Messages.getString("XSLStackFrame.5") + lineNumber; //$NON-NLS-1$
-	}
-
-	public IRegisterGroup[] getRegisterGroups() throws DebugException
-	{
-		return null;
-	}
-
-	public boolean hasRegisterGroups() throws DebugException
-	{
-		return false;
-	}
-
-	public boolean canStepInto()
-	{
-		return getThread().canStepInto();
-	}
-
-	public boolean canStepOver()
-	{
-		return getThread().canStepOver();
-	}
-
-	public boolean canStepReturn()
-	{
-		return getThread().canStepReturn();
-	}
-
-	public boolean isStepping()
-	{
-		return getThread().isStepping();
-	}
-
-	public void stepInto() throws DebugException
-	{
-		getThread().stepInto();
-	}
-
-	public void stepOver() throws DebugException
-	{
-		getThread().stepOver();
-	}
-
-	public void stepReturn() throws DebugException
-	{
-		getThread().stepReturn();
-	}
-
-	public boolean canResume()
-	{
-		return getThread().canResume();
-	}
-
-	public boolean canSuspend()
-	{
-		return getThread().canSuspend();
-	}
-
-	public boolean isSuspended()
-	{
-		return getThread().isSuspended();
-	}
-
-	public void resume() throws DebugException
-	{
-		getThread().resume();
-	}
-
-	public void suspend() throws DebugException
-	{
-		getThread().suspend();
-	}
-
-	public boolean canTerminate()
-	{
-		return getThread().canTerminate();
-	}
-
-	public boolean isTerminated()
-	{
-		return getThread().isTerminated();
-	}
-
-	public void terminate() throws DebugException
-	{
-		getThread().terminate();
-	}
-
-	/**
-	 * Returns the name of the source file this stack frame is associated with.
-	 */
-	public String getSourceName()
-	{
-		return xslFileName;
-	}
-
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (obj instanceof XSLStackFrame)
-		{
-			XSLStackFrame sf = (XSLStackFrame) obj;
-			return sf.id == id;
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode()
-	{
-		return getSourceName().hashCode() + id;
-	}
-
-	protected int getIdentifier()
-	{
-		return id;
-	}
-
-	public void setLineNumber(int lineNumber)
-	{
-		this.lineNumber = lineNumber;
-	}
-
-	public void setVariables(IVariable[] variables)
-	{
-		this.variables = variables;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLThread.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLThread.java
deleted file mode 100644
index 1e88e0e..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLThread.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.model;
-
-import org.eclipse.debug.core.DebugException;
-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;
-
-public class XSLThread extends XSLDebugElement implements IThread
-{
-
-	/**
-	 * Breakpoints this thread is suspended at or <code>null</code> if none.
-	 */
-	private IBreakpoint[] fBreakpoints;
-
-	/**
-	 * Whether this thread is stepping
-	 */
-	private boolean fStepping = false;
-
-	/**
-	 * Constructs a new thread for the given target
-	 */
-	public XSLThread(IDebugTarget target)
-	{
-		super(target);
-	}
-
-	public IStackFrame[] getStackFrames() throws DebugException
-	{
-		if (isSuspended())
-		{
-			return ((IXSLDebugTarget) getDebugTarget()).getStackFrames();
-		}
-		else
-		{
-			return new IStackFrame[0];
-		}
-	}
-
-	public boolean hasStackFrames() throws DebugException
-	{
-		return isSuspended();
-	}
-
-	public int getPriority() throws DebugException
-	{
-		return 0;
-	}
-
-	public IStackFrame getTopStackFrame() throws DebugException
-	{
-		IStackFrame[] frames = getStackFrames();
-		if (frames.length > 0)
-		{
-			return frames[0];
-		}
-		return null;
-	}
-
-	public String getName() throws DebugException
-	{
-		return "Thread[1]"; //$NON-NLS-1$
-	}
-
-	public IBreakpoint[] getBreakpoints()
-	{
-		if (fBreakpoints == null)
-		{
-			return new IBreakpoint[0];
-		}
-		return fBreakpoints;
-	}
-
-	/**
-	 * Sets the breakpoints this thread is suspended at, or <code>null</code>
-	 * if none.
-	 * 
-	 * @param breakpoints
-	 *            the breakpoints this thread is suspended at, or
-	 *            <code>null</code> if none
-	 */
-	protected void setBreakpoints(IBreakpoint[] breakpoints)
-	{
-		fBreakpoints = breakpoints;
-	}
-
-	public boolean canResume()
-	{
-		return isSuspended();
-	}
-
-	public boolean canSuspend()
-	{
-		return !isSuspended();
-	}
-
-	public boolean isSuspended()
-	{
-		return getDebugTarget().isSuspended();
-	}
-
-	public void resume() throws DebugException
-	{
-		getDebugTarget().resume();
-	}
-
-	public void suspend() throws DebugException
-	{
-		getDebugTarget().suspend();
-	}
-
-	public boolean canStepInto()
-	{
-		return isSuspended();
-	}
-
-	public boolean canStepOver()
-	{
-		return isSuspended();
-	}
-
-	public boolean canStepReturn()
-	{
-		return isSuspended();
-	}
-
-	public boolean isStepping()
-	{
-		return fStepping;
-	}
-
-	public void stepInto() throws DebugException
-	{
-		((IXSLDebugTarget) getDebugTarget()).stepInto();
-	}
-
-	public void stepOver() throws DebugException
-	{
-		((IXSLDebugTarget) getDebugTarget()).stepOver();
-	}
-
-	public void stepReturn() throws DebugException
-	{
-		((IXSLDebugTarget) getDebugTarget()).stepReturn();
-	}
-
-	public boolean canTerminate()
-	{
-		return !isTerminated();
-	}
-
-	public boolean isTerminated()
-	{
-		return getDebugTarget().isTerminated();
-	}
-
-	public void terminate() throws DebugException
-	{
-		getDebugTarget().terminate();
-	}
-
-	protected void setStepping(boolean stepping)
-	{
-		fStepping = stepping;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLValue.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLValue.java
deleted file mode 100644
index d6a391f..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLValue.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.debug.core.model.IVariable;
-
-public class XSLValue extends XSLDebugElement implements IValue
-{
-	private final String fValue;
-	private final String type;
-
-	public XSLValue(IDebugTarget target, String type, String value)
-	{
-		super(target);
-		this.type = type;
-		fValue = value;
-	}
-
-	public String getReferenceTypeName() throws DebugException
-	{
-		return type;
-	}
-
-	public String getValueString() throws DebugException
-	{
-		if ("string".equals(type)) //$NON-NLS-1$
-			return "'"+fValue+"'"; //$NON-NLS-1$ //$NON-NLS-2$
-		return fValue;
-	}
-
-	public boolean isAllocated() throws DebugException
-	{
-		return true;
-	}
-
-	public IVariable[] getVariables() throws DebugException
-	{
-		return new IVariable[0];
-	}
-
-	public boolean hasVariables() throws DebugException
-	{
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLVariable.java b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLVariable.java
deleted file mode 100644
index 71805f7..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/XSLVariable.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.model;
-
-import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.debug.core.model.IValue;
-import org.eclipse.debug.core.model.IVariable;
-
-public class XSLVariable extends XSLDebugElement implements IVariable
-{
-	public static final String LOCAL_SCOPE = "L"; //$NON-NLS-1$
-	public static final String TUNNEL_SCOPE = "T"; //$NON-NLS-1$
-	public static final String GLOBAL_SCOPE = "G"; //$NON-NLS-1$
-
-	private final int id;
-	private String fName;
-	private String scope;
-	private String type;
-
-	public XSLVariable(IDebugTarget target, int id)
-	{
-		super(target);
-		this.id = id;
-	}
-
-	public int getId()
-	{
-		return id;
-	}
-
-	public IValue getValue() throws DebugException
-	{
-		return ((IXSLDebugTarget) getDebugTarget()).getVariableValue(this);
-	}
-	
-	public void setName(String name)
-	{
-		this.fName = name;
-	}
-
-	public String getName() throws DebugException
-	{
-		return fName;
-	}
-
-	public String getReferenceTypeName() throws DebugException
-	{
-		if (GLOBAL_SCOPE.equals(scope))
-			return "global"; //$NON-NLS-1$
-		return "local"; //$NON-NLS-1$
-	}
-
-	public boolean hasValueChanged() throws DebugException
-	{
-		return false;
-	}
-
-	public void setValue(String expression) throws DebugException
-	{
-	}
-
-	public void setValue(IValue value) throws DebugException
-	{
-	}
-
-	public boolean supportsValueModification()
-	{
-		return false;
-	}
-
-	public boolean verifyValue(String expression) throws DebugException
-	{
-		return false;
-	}
-
-	public boolean verifyValue(IValue value) throws DebugException
-	{
-		return false;
-	}
-	
-	public void setScope(String scope)
-	{
-		this.scope = scope;
-	}
-
-	public String getScope()
-	{
-		return scope;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/messages.properties b/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/messages.properties
deleted file mode 100644
index 8630d45..0000000
--- a/bundles/org.eclipse.wst.xsl.launching/src/org/eclipse/wst/xsl/launching/model/messages.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-XSLDebugTarget.0=Unable to connect to debugger
-XSLDebugTarget.1=localhost
-XSLDebugTarget.19=Request failed: 
-XSLDebugTarget.2=Could not connect to socket 
-XSLDebugTarget.20=Event Dispatch
-XSLDebugTarget.3=\ after 
-XSLDebugTarget.4=\ attempts
-XSLLineBreakpoint.0=Line Breakpoint: 
-XSLStackFrame.5=\ line: 
diff --git a/bundles/org.eclipse.wst.xsl.saxon/.classpath b/bundles/org.eclipse.wst.xsl.saxon/.classpath
deleted file mode 100644
index de15a1a..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-debugger"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsl.saxon/.project b/bundles/org.eclipse.wst.xsl.saxon/.project
deleted file mode 100644
index f884eee..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.saxon</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/bundles/org.eclipse.wst.xsl.saxon/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.saxon/META-INF/MANIFEST.MF
deleted file mode 100644
index 0650256..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsl.saxon;singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Require-Bundle: org.eclipse.wst.xsl.debug
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
diff --git a/bundles/org.eclipse.wst.xsl.saxon/SaxonFeatures.properties b/bundles/org.eclipse.wst.xsl.saxon/SaxonFeatures.properties
deleted file mode 100644
index dfc488e..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/SaxonFeatures.properties
+++ /dev/null
@@ -1,73 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Doug Satchwell (Chase Technology Ltd) - initial API and implementation
-###############################################################################
-ALLOW_EXTERNAL_FUNCTIONS=http://saxon.sf.net/feature/allow-external-functions
-ALLOW_EXTERNAL_FUNCTIONS.TYPE=boolean
-ALLOW_EXTERNAL_FUNCTIONS.DESC=true if the stylesheet allows external functions to be called. Default is true. The setting false is recommended in an environment where untrusted stylesheets may be executed. Setting this value to false  also disables user-defined extension elements, together with the writing of multiple output files, all of which carry similar security risks.
-
-TRACE_EXTERNAL_FUNCTIONS=http://saxon.sf.net/feature/trace-external-functions
-TRACE_EXTERNAL_FUNCTIONS.TYPE=boolean
-TRACE_EXTERNAL_FUNCTIONS.DESC=true if the tracing of calls to external Java methods is required. Default is false. This switch is useful when analyzing why Saxon fails to find a Java method to match an extension function call in the stylesheet, or why it chooses one method over another when several are available. The trace output is sent to System.err.
-
-TIMING=http://saxon.sf.net/feature/timing
-TIMING.TYPE=boolean
-TIMING.DESC=true if basic timing information is to be output to the standard error output stream.
-
-TREE_MODEL=http://saxon.sf.net/feature/treeModel
-TREE_MODEL.TYPE=int
-TREE_MODEL.DESC=Builder.STANDARD_TREE or Builder.TINY_TREE. Selects an implementation of the Saxon tree model. The default is Builder.TINY_TREE.
-
-TRACE_LISTENER=http://saxon.sf.net/feature/traceListener
-TRACE_LISTENER.TYPE=object
-TRACE_LISTENER.DESC=an instance of the class net.sf.saxon.trace.TraceListener. This object will be notified of significant events occurring during the transformation, for tracing or debugging purposes.
-
-LINE_NUMBERING=http://saxon.sf.net/feature/linenumbering
-LINE_NUMBERING.TYPE=boolean
-LINE_NUMBERING.DESC=indicates whether line numbers are to be maintained for the source document. This will not be possible if the source document is supplied as a DOM. The line numbers are accessible through the tracing interface, and also via the saxon:line-number() extension function.
-
-RECOVERY_POLICY=http://saxon.sf.net/feature/recoveryPolicy
-RECOVERY_POLICY.TYPE=int
-RECOVERY_POLICY.DESC=An Integer. Indicates how dynamic errors should be handled. One of the values (defined as constants in the Controller class) RECOVER_SILENTLY, RECOVER_WITH_WARNINGS, or DO_NOT_RECOVER).
-
-MESSAGE_EMITTER_CLASS=http://saxon.sf.net/feature/messageEmitterClass
-MESSAGE_EMITTER_CLASS.TYPE=class
-MESSAGE_EMITTER_CLASS.DESC=The full name of a saxon emitter class. that implements the net.sf.saxon.output.Emitter interface; the class will be used to format the output of the xsl:message instruction.
-
-SOURCE_PARSER_CLASS=http://saxon.sf.net/feature/sourceParserClass
-SOURCE_PARSER_CLASS.TYPE=class
-SOURCE_PARSER_CLASS.DESC=The full name of a class that implements the org.xml.sax.XMLReader interface; the class will be used to parse source documents (that is, the principal source document plus any secondary source documents read using the document() function)
-
-STYLE_PARSER_CLASS=http://saxon.sf.net/feature/styleParserClass
-STYLE_PARSER_CLASS.TYPE=class
-STYLE_PARSER_CLASS.DESC=The full name of a class that implements the org.xml.sax.XMLReader interface; the class will be used to parse stylesheet documents (that is, the principal stylesheet module plus any secondary source documents read using xsl:include or xsl:import)
-
-OUTPUT_URI_RESOLVER=http://saxon.sf.net/feature/outputURIResolver
-OUTPUT_URI_RESOLVER.TYPE=object
-OUTPUT_URI_RESOLVER.DESC=An instance of the class net.sf.saxon.OutputURIResolver; this object will be used to resolve URIs of secondary result documents specified in the href attribute of the xsl:result-document  instruction
-
-DTD_VALIDATION=http://saxon.sf.net/feature/validation
-DTD_VALIDATION.TYPE=boolean
-DTD_VALIDATION.DESC=Indicates whether the XML parser should be asked to validate source documents against their DTD. This applies to the initial source document and any source documents read using the document() function, unless handled by a user-written URIResolver.
-
-VALIDATION_WARNINGS=http://saxon.sf.net/feature/validation-warnings
-VALIDATION_WARNINGS.TYPE=boolean
-VALIDATION_WARNINGS.DESC=This determines whether validation errors in result documents should be treated as fatal. By default they are fatal; with this option set, they are treated as warnings.
-
-SCHEMA_VALIDATION=http://saxon.sf.net/feature/schema-validation
-SCHEMA_VALIDATION.TYPE=boolean
-SCHEMA_VALIDATION.DESC=This determines whether source documents should be parsed with schema-validation enabled.
-
-VERSION_WARNING=http://saxon.sf.net/feature/version-warning
-VERSION_WARNING.TYPE=boolean
-VERSION_WARNING.DESC=This determines whether a warning should be output when running an XSLT 2.0 processor against an XSLT 1.0 stylesheet. The XSLT specification requires this to be done by default.
-
-NAME_POOL=http://saxon.sf.net/feature/namePool
-NAME_POOL.TYPE=object
-NAME_POOL.DESC=A instance of class net.sf.saxon.om.NamePool. Indicates that the supplied NamePool should be used as the target (run-time) NamePool by all stylesheets compiled (using newTemplates()) after this call on setAttribute. Normally a single system-allocated NamePool is used for all stylesheets compiled while the Java VM remains loaded; this attribute allows user control over the allocation of NamePools. Note that source trees used as input to a transformation must be built using the same NamePool that is used when the stylesheet is compiled: this will happen automatically if the input to a transformation is supplied as a SAXSource or StreamSource but it is under user control if you build the source tree yourself.
diff --git a/bundles/org.eclipse.wst.xsl.saxon/SaxonOutputProperties.properties b/bundles/org.eclipse.wst.xsl.saxon/SaxonOutputProperties.properties
deleted file mode 100644
index e979071..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/SaxonOutputProperties.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Doug Satchwell (Chase Technology Ltd) - initial API and implementation
-###############################################################################
-INDENT_SPACES={http://saxon.sf.net/}indent-spaces
-INDENT_SPACES.DESC=(integer value).Defines the number of spaces used for indentation of output
-
-UNDECLARE_NAMESPACES={http://saxon.sf.net/}undeclare-namespaces
-UNDECLARE_NAMESPACES.DESC=include-content-type = "yes" | "no". This attribute is defined in XSLT 2.0. Indicates XML 1.1 namespace declarations are to be output.
-
-CHARACTER_REPRESENTATION={http://saxon.sf.net/}character-representation
-CHARACTER_REPRESENTATION.DESC=(rep1[;rep2]). Indicates the preferred way of representing non-ASCII characters in HTML and XML output. rep1 is for characters in the range 128-256, rep2 for those above 256.
-
-NEXT_IN_CHAIN={http://saxon.sf.net/}next-in-chain
-NEXT_IN_CHAIN.DESC=(uri). Indicates that the output is to be piped into another XSLT stylesheet to perform another transformation. The auxiliary property NEXT_IN_CHAIN_BASE_URI records the base URI of the stylesheet element where this attribute was found.
-
-TYPE_INFORMATION={http://saxon.sf.net/}type-information
-TYPE_INFORMATION.DESC=(none|preserve|strict|lax). Indicates the value of the type-information attribute: "none", "preserve", "strict", "lax"
-
-REQUIRE_WELL_FORMED={http://saxon.sf.net/}require-well-formed
-REQUIRE_WELL_FORMED.DESC=(yes|no). Indicates whether a user-supplied ContentHandler requires the stream of SAX events to be well-formed (that is, to have a single element node and no text nodes as children of the root). The default is "no".
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.saxon/about.html b/bundles/org.eclipse.wst.xsl.saxon/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</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/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</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>
diff --git a/bundles/org.eclipse.wst.xsl.saxon/build.properties b/bundles/org.eclipse.wst.xsl.saxon/build.properties
deleted file mode 100644
index 5f0acbe..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src-debugger/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               SaxonFeatures.properties,\
-               SaxonOutputProperties.properties,\
-               about.html,\
-               plugin.xml,\
-               plugin.properties
diff --git a/bundles/org.eclipse.wst.xsl.saxon/plugin.properties b/bundles/org.eclipse.wst.xsl.saxon/plugin.properties
deleted file mode 100644
index 14778c7..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.saxon
-Bundle-Name.0 = Saxon Plug-in (Incubating)
-processorType.label.0 = Saxon
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.saxon/plugin.xml b/bundles/org.eclipse.wst.xsl.saxon/plugin.xml
deleted file mode 100644
index 6982b1d..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.wst.xsl.launching.processorType">
-      <processorType
-            featureProperties="SaxonFeatures.properties"
-            id="org.eclipse.wst.xsl.saxon.processorType"
-            label="%processorType.label.0"
-            outputProperties="SaxonOutputProperties.properties"
-            transformerFactory="net.sf.saxon.TransformerFactoryImpl">
-      </processorType>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsl.saxon/src-debugger/README.txt b/bundles/org.eclipse.wst.xsl.saxon/src-debugger/README.txt
deleted file mode 100644
index 1063a57..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/src-debugger/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Just a placeholder to ensure src folder appears.
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.ui/.classpath b/bundles/org.eclipse.wst.xsl.ui/.classpath
deleted file mode 100644
index 19e2a36..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/.classpath
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/apache/xpath/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="**/xsl/core/**"/>
-			<accessrule kind="accessible" pattern="**/xml/**"/>
-			<accessrule kind="accessible" pattern="**/sse/**"/>
-			<accessrule kind="accessible" pattern="**/validation/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsl.ui/.project b/bundles/org.eclipse.wst.xsl.ui/.project
deleted file mode 100644
index ea6d47e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.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/bundles/org.eclipse.wst.xsl.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xsl.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9a93417..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,25 +0,0 @@
-#Thu Mar 20 20:08:20 GMT-05:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 252e744..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,39 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xsl.ui;singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.wst.xsl.ui.internal.XSLUIPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.ui.console;bundle-version="[3.2.0,4.0.0)",
- org.apache.xml.serializer;bundle-version="[2.7.1,2.8.0)",
- org.eclipse.debug.ui;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.search;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.navigator.resources;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
- org.apache.xalan;bundle-version="[2.7.1,2.8.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.400,2.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.wst.xsl.core;bundle-version="[0.5.0,1.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.1.103,2.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.navigator;bundle-version="3.3.100"
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.wst.xsl.ui.internal;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.actions;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.contentassist;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.editor;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.perspective;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.preferences;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.style;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.templates;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.util;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.validation;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.wizards;x-internal:=true
diff --git a/bundles/org.eclipse.wst.xsl.ui/build.properties b/bundles/org.eclipse.wst.xsl.ui/build.properties
deleted file mode 100644
index 3cd9ed1..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               templates/
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/XMLFile.gif b/bundles/org.eclipse.wst.xsl.ui/icons/XMLFile.gif
deleted file mode 100755
index 14eb1be..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/XMLFile.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/ancestor.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/ancestor.gif
deleted file mode 100644
index 697db80..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/ancestor.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/directional.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/directional.gif
deleted file mode 100644
index ec90bc2..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/directional.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/family.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/family.gif
deleted file mode 100644
index e917f3e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/family.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/function.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/function.gif
deleted file mode 100644
index a81fd68..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/function.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/new_xml.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/new_xml.gif
deleted file mode 100644
index 9dfb62d..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/new_xml.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/operation.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/operation.gif
deleted file mode 100644
index b55d9e3..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/operation.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/variable.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/variable.gif
deleted file mode 100644
index f6d83cb..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/variable.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/plugin.properties b/bundles/org.eclipse.wst.xsl.ui/plugin.properties
deleted file mode 100644
index 860743e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005-2007 Orangevolt (www.orangevolt.com)
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Lars Gersmann (www.orangevolt.com) - XSL UI support
-#     David Carver - STAR - bug 215126, 213853
-#     
-###############################################################################
-
-providerName=Eclipse.org
-pluginName=Eclipse XSL UI Plug-in
-perspectiveName=XML
-page.name.0 = XSL
-Structured_XML_Document_Factory_Extension.name = XSL Document Factory
diff --git a/bundles/org.eclipse.wst.xsl.ui/plugin.xml b/bundles/org.eclipse.wst.xsl.ui/plugin.xml
deleted file mode 100644
index 28751c4..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/plugin.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-	<extension point="org.eclipse.ui.perspectives">
-		<perspective id="org.eclipse.wst.xsl.ui.perspective"
-			class="org.eclipse.wst.xsl.ui.internal.perspective.XMLPerspectiveFactory"
-			icon="icons/XMLFile.gif" 
-			name="%perspectiveName">
-		</perspective>
-	</extension>
-	
-	<extension point="org.eclipse.ui.editors">
-		<editor name="XSL Editor" 
-			icon="icons/full/operation.gif"
-			contributorClass="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorActionBarContributor"
-			class="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"
-			default="true"
-			extensions="xsl,xslt"
-			id="org.eclipse.wst.xsl.ui.XSLEditor">
-			<contentTypeBinding contentTypeId="org.eclipse.wst.xml.core.xslsource" />
-		</editor>
-	</extension>
-	
-    <!-- Editor actionsets -->
-	<extension point="org.eclipse.ui.actionSetPartAssociations">
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
-			<part id="org.eclipse.wst.xsl.ui.XSLEditor" />
-		</actionSetPartAssociation>
-		<actionSetPartAssociation targetID="org.eclipse.ui.NavigateActionSet">
-			<part id="org.eclipse.wst.xsl.ui.XSLEditor" />
-		</actionSetPartAssociation>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
-		<sourceViewerConfiguration
-			class="org.eclipse.wst.xsl.ui.internal.StructuredTextViewerConfigurationXSL"
-			target="org.eclipse.wst.xml.core.xslsource">
-		</sourceViewerConfiguration>
-	</extension>
-	
-	<extension point="org.eclipse.ui.newWizards">
-		<wizard category="org.eclipse.wst.XMLCategory"
-			class="org.eclipse.wst.xsl.ui.internal.wizards.NewXSLFileWizard"
-			finalPerspective="org.eclipse.wst.xsl.ui.perspective" 
-			icon="icons/full/operation.gif"
-			id="org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard"
-			name="XSL" 
-			preferredPerspectives="org.eclipse.wst.xsl.ui.perspective">
-			<description>Create a new XSL Stylesheet</description>
-			<selection class="org.eclipse.core.resources.IResource">
-			</selection>
-		</wizard>
-	</extension>
-	
-	<!-- XSL templates -->
-	<extension point="org.eclipse.ui.editors.templates">
-		<contextType
-			class="org.eclipse.wst.xsl.ui.internal.templates.TemplateContextTypeXSL"
-			id="xsl_new" name="New XSL">
-		</contextType>
-		<include file="templates/file_templates.xml" />
-	</extension>
-
-	<!-- XPath templates -->
-	<extension point="org.eclipse.ui.editors.templates">
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xpath_axis" name="axis">
-		</contextType>
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="exslt_function" name="exslt">
-		</contextType>
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xsl_xpath" name="xpath">
-		</contextType>
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xpath_2" name="xpath 2.0">
-		</contextType>
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xpath_operator" name="operator">
-		</contextType>
-		<contextType
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="extension_function" name="custom">
-		</contextType>
-		<include file="templates/xpath_templates.xml"/>
-		<include file="templates/xpath_operator_templates.xml"/>
-		<include file="templates/xpath_axis_templates.xml"/>
-	</extension>
-	
-	<extension point="org.eclipse.ui.preferencePages">
-		<page category="org.eclipse.wst.xml.ui.preferences.xml"
-			class="org.eclipse.wst.xsl.ui.internal.preferences.MainPreferencePage"
-			id="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage" 
-			name="%page.name.0" />
-		<page category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
-			class="org.eclipse.wst.xsl.ui.internal.preferences.XSLTemplatePreferencePage"
-			id="org.eclipse.wst.xsl.ui.template.preferencePage" 
-			name="Templates">
-		</page>
-		<page category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
-			class="org.eclipse.wst.xsl.ui.internal.preferences.XPathTemplatePreferencePage"
-			id="org.eclipse.wst.xsl.ui.XPath" 
-			name="XPath Templates">
-			<keywordReference id="org.eclipse.wst.xsl.ui.templates"/>
-		</page>
-		<page category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
-			class="org.eclipse.wst.xsl.ui.internal.preferences.ValidationPreferencePage"
-			id="org.eclipse.wst.xsl.ui.preferences.Validation" 
-			name="Validation">
-		</page>
-	</extension>
-	
-	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator scope="total"
-			class="org.eclipse.wst.xsl.ui.internal.validation.DelegatingSourceValidatorForXSL"
-			id="org.eclipse.wst.xsl.ui.internal.validation.DelegatingSourceValidatorForXSL">
-			<contentTypeIdentifier id="org.eclipse.wst.xml.core.xslsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT">
-				</partitionType>
-			</contentTypeIdentifier>
-			<contentTypeIdentifier id="org.eclipse.wst.xsl.core.xslsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT">
-				</partitionType>
-			</contentTypeIdentifier>
-		</validator>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator scope="partial"
-			class="org.eclipse.wst.xsl.ui.internal.validation.XSLMarkupValidator"
-			id="org.eclipse.wst.xsl.ui.internal.validator.markupvalidator">
-			<contentTypeIdentifier id="org.eclipse.wst.xml.core.xslsource">
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-			</contentTypeIdentifier>
-			<contentTypeIdentifier id="org.eclipse.wst.xsl.core.xslsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT" />
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT" />
-			</contentTypeIdentifier>
-		</validator>
-	</extension>
-	
-<!--   <extension
-         point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator
-			scope="total"
-			class="org.eclipse.wst.xsl.ui.internal.validation.DelegatingSourceValidatorForXalanXSL"
-			id="org.eclipse.wst.xsl.ui.internal.validation.DelegatingSourceValidatorForXalanXSL">
-			<contentTypeIdentifier
-				id="org.eclipse.wst.xml.core.xslsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT">
-				</partitionType>
-			</contentTypeIdentifier>
-			<contentTypeIdentifier
-				id="org.eclipse.wst.xsl.core.xslsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT">
-				</partitionType>
-			</contentTypeIdentifier>
-		</validator>
-   </extension>
--->
-	
-	<extension point="org.eclipse.ui.actionSets">
-		<actionSet id="org.eclipse.wst.xsl.ui.xslActionSet" label="XSL Actions">
-			<action id="org.eclipse.wst.xsl.ui.newXSLFileAction"
-				class="org.eclipse.wst.xsl.ui.internal.actions.NewXSLFileWizardDelegate"
-				icon="icons/full/operation.gif" 
-				label="New XSL File" 
-				style="push" 
-				toolbarPath="org.eclipse.wst.xsl.ui.xslActionSet" />
-			<action id="org.eclipse.wst.xsl.ui.newXSLFileAction"
-				class="org.eclipse.wst.xsl.ui.internal.actions.NewXMLFileWizardDelegate"
-				icon="icons/full/new_xml.gif" 
-				label="New XML File" 
-				style="push" 
-				toolbarPath="org.eclipse.wst.xsl.ui.xslActionSet" />
-		</actionSet>
-	</extension>
-	
- <extension
-       point="org.eclipse.ui.perspectiveExtensions">
-    <perspectiveExtension
-          targetID="org.eclipse.wst.xsl.ui.perspective">
-       <newWizardShortcut
-             id="org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.wst.wsdl.ui">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard">
-       </newWizardShortcut>
-    </perspectiveExtension>
-   </extension>
-	 <extension
-	       point="org.eclipse.ui.navigator.navigatorContent">
-	       <commonWizard
-	             type="new"
-	             wizardId="org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard">
-	          <enablement></enablement>
-	       </commonWizard>
-	       <commonWizard
-	             type="new"
-	             wizardId="org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard">
-	          <enablement>
-	          
-	          </enablement>
-	       </commonWizard>
-	       <commonWizard
-	             type="new"
-	             wizardId="org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard">
-	          <enablement></enablement>
-	       </commonWizard>
-	       <commonWizard
-	             type="new"
-	             wizardId="org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard">
-	          <enablement>
-	          </enablement>
-	       </commonWizard>
-	       <commonWizard
-	             type="new"
-	             wizardId="org.eclipse.wst.wsdl.ui">
-	          <enablement></enablement>
-	       </commonWizard>
-	 </extension>	
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/StructuredTextViewerConfigurationXSL.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/StructuredTextViewerConfigurationXSL.java
deleted file mode 100644
index ea41ba0..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/StructuredTextViewerConfigurationXSL.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.internal;
-
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-import org.eclipse.wst.sse.core.text.IStructuredPartitions;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider; // import
-																			// org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.eclipse.wst.xml.ui.internal.contentassist.NoRegionContentAssistProcessor;
-import org.eclipse.wst.xml.ui.internal.style.LineStyleProviderForXML;
-import org.eclipse.wst.xsl.core.internal.text.IXSLPartitions;
-import org.eclipse.wst.xsl.core.internal.text.rules.StructuredTextPartitionerForXSL;
-import org.eclipse.wst.xsl.ui.internal.contentassist.XSLContentAssistProcessor;
-import org.eclipse.wst.xsl.ui.internal.editor.XSLHyperlinkDetector;
-import org.eclipse.wst.xsl.ui.internal.style.LineStyleProviderForXSL;
-
-/**
- * StructuredTextViewerConfigurationXSL implements content assistance for
- * attributes and other XPath related functionality.
- * 
- * @author dcarver
- * 
- */
-public class StructuredTextViewerConfigurationXSL extends
-		StructuredTextViewerConfigurationXML {
-
-	private String[] fConfiguredContentTypes;
-	private LineStyleProvider fLineStyleProviderForXSL;
-	private LineStyleProvider fLineStyleProviderForXML;
-
-	/**
-	 * Configuration for XSL Content Types
-	 */
-	public StructuredTextViewerConfigurationXSL() {
-		super();
-	}
-
-	/**
-	 * Return the processors for the current content type.
-	 */
-	@Override
-	protected IContentAssistProcessor[] getContentAssistProcessors(
-			ISourceViewer sourceViewer, String partitionType) {
-		IContentAssistProcessor[] processors = null;
-
-		if ((partitionType == IStructuredPartitions.DEFAULT_PARTITION)
-				|| (partitionType == IXMLPartitions.XML_DEFAULT)
-				|| (partitionType == IXSLPartitions.XSL_XPATH)) {
-			processors = new IContentAssistProcessor[] { new XSLContentAssistProcessor() };
-		} else if (partitionType == IStructuredPartitions.UNKNOWN_PARTITION) {
-			processors = new IContentAssistProcessor[] { new NoRegionContentAssistProcessor() };
-		}
-		return processors;
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.editors.text.TextSourceViewerConfiguration#getHyperlinkDetectors(org.eclipse.jface.text.source.ISourceViewer)
-	 */
-	@Override
-	public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
-		if (sourceViewer == null
-				|| !fPreferenceStore
-						.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED))
-			return null;
-		IHyperlinkDetector[] superDetectors = super
-				.getHyperlinkDetectors(sourceViewer);
-		IHyperlinkDetector[] allDetectors = new IHyperlinkDetector[superDetectors.length + 1];
-		allDetectors[0] = new XSLHyperlinkDetector();
-		System.arraycopy(superDetectors, 0, allDetectors, 1,
-				superDetectors.length);
-		return allDetectors;
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML#getConfiguredContentTypes(org.eclipse.jface.text.source.ISourceViewer)
-	 */
-	@Override
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-		if (fConfiguredContentTypes == null) {
-			String[] xslTypes = StructuredTextPartitionerForXSL
-					.getConfiguredContentTypes();
-			fConfiguredContentTypes = new String[xslTypes.length + 2];
-			fConfiguredContentTypes[0] = IStructuredPartitions.DEFAULT_PARTITION;
-			fConfiguredContentTypes[1] = IStructuredPartitions.UNKNOWN_PARTITION;
-			int index = 0;
-			System.arraycopy(xslTypes, 0, fConfiguredContentTypes, index += 2,
-					xslTypes.length);
-		}
-		return fConfiguredContentTypes;
-	}
-
-	@Override
-	public LineStyleProvider[] getLineStyleProviders(
-			ISourceViewer sourceViewer, String partitionType) {
-		LineStyleProvider[] providers = null;
-		
-		if ((partitionType == IXSLPartitions.XSL_XPATH)) {
-			providers = new LineStyleProvider[] { getLineStyleProviderForXSL() };
-		} else if ((partitionType == IXMLPartitions.XML_DEFAULT)
-				|| (partitionType == IXMLPartitions.XML_CDATA)
-				|| (partitionType == IXMLPartitions.XML_COMMENT)
-				|| (partitionType == IXMLPartitions.XML_DECLARATION)
-				|| (partitionType == IXMLPartitions.XML_PI)) {
-			providers = new LineStyleProvider[] { getLineStyleProviderForXML() };
-		}
-
-		return providers;
-	}
-	
-	protected LineStyleProvider getLineStyleProviderForXSL() {
-		if (fLineStyleProviderForXSL == null) {
-			fLineStyleProviderForXSL = new LineStyleProviderForXSL();
-		}
-		return fLineStyleProviderForXSL;
-	}
-	
-	private LineStyleProvider getLineStyleProviderForXML() {
-		if (fLineStyleProviderForXML == null) {
-			fLineStyleProviderForXML = new LineStyleProviderForXML();
-		}
-		return fLineStyleProviderForXML;
-	}	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLUIConstants.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLUIConstants.java
deleted file mode 100644
index b815457..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLUIConstants.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal;
-
-public class XSLUIConstants
-{
-	public static final String TEMPLATE_CONTEXT_XSL_NEW = "xsl_new";
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLUIPlugin.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLUIPlugin.java
deleted file mode 100644
index 920ed33..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLUIPlugin.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.internal;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
-import org.eclipse.ui.editors.text.templates.ContributionTemplateStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.preferences.ScopedPreferenceStore;
-
-/**
- * XSLUIPlugin
- * @author dcarver
- *
- */
-public class XSLUIPlugin extends AbstractUIPlugin {
-	
-	/**
-	 * 
-	 */
-	public static final String ID = null;
-
-	/**
-	 * A Singleton Instance of this plugin.
-	 */
-	protected static XSLUIPlugin INSTANCE;
-	
-	/**
-	 * The template store for the xsl editor.
-	 */
-	private TemplateStore fTemplateStore;
-
-	/**
-	 * The template store for xpath.
-	 */
-	private TemplateStore fXPathTemplateStore;
-	
-    private ScopedPreferenceStore preferenceStore;
-    
-	/**
-	 * The template context type registry for the xml editor.
-	 */
-	private ContributionContextTypeRegistry fContextTypeRegistry;
-	
-	/**
-	 * The template context type registry for xpath.
-	 */
-	private ContributionContextTypeRegistry fXPathContextTypeRegistry;
-	
-	/**
-	 * The plugin id for this plugin.
-	 */
-	static public String PLUGIN_ID = "org.eclipse.wst.xsl.ui"; //$NON-NLS-1$
-	/**
-	 * Constructor Class
-	 */
-	public XSLUIPlugin() {
-	   super();
-	   INSTANCE = this;
-	}
-	
-	/**
-	 * Returns a default instance
-	 * @return
-	 */
-	public static XSLUIPlugin getDefault() {
-		if (INSTANCE == null) {
-			INSTANCE = new XSLUIPlugin();
-		}
-		return INSTANCE;
-	}
-
-	/**
-	 * TODO: Add Javadoc
-	 * @return
-	 */
-	public synchronized static XSLUIPlugin getInstance() {
-		if (INSTANCE == null) {
-			INSTANCE = new XSLUIPlugin();
-		}
-		return INSTANCE;
-	}
-	
-	
-	
-	/**
-	 * Utility methods for logging exceptions.
-	 * 
-	 * @param e 
-	 * @param severity 
-	 */
-	public static void log(Throwable e, int severity) {
-		IStatus status = null;
-		if (e instanceof CoreException) {
-			status = ((CoreException)e).getStatus();
-		} else {
-			String m = e.getMessage();
-			status = new Status(severity, PLUGIN_ID, 0, m==null? "<no message>" : m, e); //$NON-NLS-1$
-		}
-		System.out.println(e.getClass().getName()+": "+status); //$NON-NLS-1$
-		INSTANCE.getLog().log(status);
-	}
-	
-	/**
-	 * 
-	 * @param throwable
-	 */
-	public static void log(Throwable throwable) { 
-		log(throwable, IStatus.ERROR); }	
-
-	
-	/**
-	 * TODO: Add Javadoc
-	 */
-    @Override
-	public IPreferenceStore getPreferenceStore() {
-		if (preferenceStore == null) {
-			preferenceStore = (ScopedPreferenceStore) PlatformUI
-					.getPreferenceStore();
-		}
-		return preferenceStore;
-	}
-    
-	/**
-	 * Returns the template store for the xsl templates.
-	 * 
-	 * @return the template store for the xsl templates
-	 */
-	public TemplateStore getTemplateStore()
-	{
-		if (fTemplateStore == null)
-		{
-			fTemplateStore = new ContributionTemplateStore(getTemplateContextRegistry(), getPreferenceStore(), "org.eclipse.wst.xsl.ui.custom_templates"); //$NON-NLS-1$
-			try
-			{
-				fTemplateStore.load();
-			}
-			catch (IOException e)
-			{
-				XSLUIPlugin.log(e);
-			}
-		}
-		return fTemplateStore;
-	}
-
-	/**
-	 * Returns the template context type registry for the xsl plugin.
-	 * 
-	 * @return the template context type registry for the xsl plugin
-	 */
-	public ContextTypeRegistry getTemplateContextRegistry()
-	{
-		if (fContextTypeRegistry == null)
-		{
-			ContributionContextTypeRegistry registry = new ContributionContextTypeRegistry();
-			registry.addContextType("xsl_new"); //$NON-NLS-1$
-			fContextTypeRegistry = registry;
-		}
-		return fContextTypeRegistry;
-	}
-
-	/**
-	 * Returns the template store for the xpath templates.
-	 * 
-	 * @return the template store for the xpath templates
-	 */
-	public TemplateStore getXPathTemplateStore() {
-		if (fXPathTemplateStore == null) {
-			fXPathTemplateStore = new ContributionTemplateStore(getXPathTemplateContextRegistry(), getPreferenceStore(), "org.eclipse.wst.xsl.ui.xpath_custom_templates"); //$NON-NLS-1$
-			try {
-				fXPathTemplateStore.load();
-			}
-			catch (IOException e) {
-				XSLUIPlugin.log(e);
-			}
-		}
-		return fXPathTemplateStore;
-	}
-	
-	/**
-	 * Returns the template context type registry for xpath
-	 * 
-	 * @return the template context type registry for xpath
-	 */
-	public ContextTypeRegistry getXPathTemplateContextRegistry() {
-		if (fXPathContextTypeRegistry == null) {
-			ContributionContextTypeRegistry registry = new ContributionContextTypeRegistry();
-			registry.addContextType("xsl_xpath"); //$NON-NLS-1$
-			registry.addContextType("xpath_operator"); //$NON-NLS-1$
-			registry.addContextType("xpath_axis"); //$NON-NLS-1$
-			registry.addContextType("exslt_function"); //$NON-NLS-1$
-			registry.addContextType("xpath_2"); //$NON-NLS-1$
-			registry.addContextType("extension_function"); //$NON-NLS-1$
-			fXPathContextTypeRegistry = registry;
-		}
-
-		return fXPathContextTypeRegistry;
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXMLFileAction.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXMLFileAction.java
deleted file mode 100644
index 16b6a06..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXMLFileAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard;
-
-public class NewXMLFileAction extends Action
-{
-	private static final int SIZING_WIZARD_WIDTH = 500;
-	private static final int SIZING_WIZARD_HEIGHT = 500;
-
-	private ISelection selection;
-
-	public void run()
-	{
-		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-
-		NewXMLWizard wizard = new NewXMLWizard();
-
-		IStructuredSelection ssel = null;
-		if (selection instanceof IStructuredSelection)
-		{
-			ssel = (IStructuredSelection) selection;
-		}
-		else
-		{
-			ssel = new StructuredSelection();
-		}
-		wizard.init(PlatformUI.getWorkbench(), ssel);
-
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.create();
-		dialog.getShell().setSize(Math.max(SIZING_WIZARD_WIDTH, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT);
-		// PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),IWorkbenchHelpContextIds.NEW_WIZARD);
-		dialog.open();
-	}
-
-	public void setSelection(ISelection selection)
-	{
-		this.selection = selection;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXMLFileWizardDelegate.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXMLFileWizardDelegate.java
deleted file mode 100644
index 75e6cde..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXMLFileWizardDelegate.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class NewXMLFileWizardDelegate implements IWorkbenchWindowActionDelegate
-{
-	private NewXMLFileAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewXMLFileAction();
-	}
-
-	public void run(IAction action)
-	{
-		openAction.setSelection(selection);
-		openAction.run();
-	}
-
-	public void selectionChanged(IAction action, ISelection selection)
-	{
-		this.selection = selection;
-	}
-
-	public void dispose()
-	{
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXSLFileAction.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXSLFileAction.java
deleted file mode 100644
index 8a1cf91..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXSLFileAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsl.ui.internal.wizards.NewXSLFileWizard;
-
-public class NewXSLFileAction extends Action
-{
-	private static final int SIZING_WIZARD_WIDTH = 500;
-	private static final int SIZING_WIZARD_HEIGHT = 500;
-
-	private ISelection selection;
-
-	public void run()
-	{
-		Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-
-		NewXSLFileWizard wizard = new NewXSLFileWizard();
-
-		IStructuredSelection ssel = null;
-		if (selection instanceof IStructuredSelection)
-		{
-			ssel = (IStructuredSelection) selection;
-		}
-		else
-		{
-			ssel = new StructuredSelection();
-		}
-		wizard.init(PlatformUI.getWorkbench(), ssel);
-
-		WizardDialog dialog = new WizardDialog(shell, wizard);
-		dialog.create();
-		dialog.getShell().setSize(Math.max(SIZING_WIZARD_WIDTH, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT);
-		// PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),IWorkbenchHelpContextIds.NEW_WIZARD);
-		dialog.open();
-	}
-
-	public void setSelection(ISelection selection)
-	{
-		this.selection = selection;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXSLFileWizardDelegate.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXSLFileWizardDelegate.java
deleted file mode 100644
index cd7046a..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXSLFileWizardDelegate.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-public class NewXSLFileWizardDelegate implements IWorkbenchWindowActionDelegate
-{
-	private NewXSLFileAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewXSLFileAction();
-	}
-
-	public void run(IAction action)
-	{
-		openAction.setSelection(selection);
-		openAction.run();
-	}
-
-	public void selectionChanged(IAction action, ISelection selection)
-	{
-		this.selection = selection;
-	}
-
-	public void dispose()
-	{
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/InclusivePositionUpdater.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/InclusivePositionUpdater.java
deleted file mode 100644
index 4ca1e06..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/InclusivePositionUpdater.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * This class copies from jface.text.templates
- * Contributors:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IPositionUpdater;
-import org.eclipse.jface.text.Position;
-
-/**
- * Position updater that takes any change in [position.offset, position.offset + position.length] as
- * belonging to the position.
- *
- * @since 3.0
- */
-class InclusivePositionUpdater implements IPositionUpdater {
-
-	/** The position category. */
-	private final String fCategory;
-
-	/**
-	 * Creates a new updater for the given <code>category</code>.
-	 *
-	 * @param category the new category.
-	 */
-	public InclusivePositionUpdater(String category) {
-		fCategory= category;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.IPositionUpdater#update(org.eclipse.jface.text.DocumentEvent)
-	 */
-	public void update(DocumentEvent event) {
-
-		int eventOffset= event.getOffset();
-		int eventOldLength= event.getLength();
-		int eventNewLength= event.getText() == null ? 0 : event.getText().length();
-		int deltaLength= eventNewLength - eventOldLength;
-
-		try {
-			Position[] positions= event.getDocument().getPositions(fCategory);
-
-			for (int i= 0; i != positions.length; i++) {
-
-				Position position= positions[i];
-
-				if (position.isDeleted())
-					continue;
-
-				int offset= position.getOffset();
-				int length= position.getLength();
-				int end= offset + length;
-
-				if (offset > eventOffset + eventOldLength)
-					// position comes way
-					// after change - shift
-					position.setOffset(offset + deltaLength);
-				else if (end < eventOffset) {
-					// position comes way before change -
-					// leave alone
-				} else if (offset <= eventOffset && end >= eventOffset + eventOldLength) {
-					// event completely internal to the position - adjust length
-					position.setLength(length + deltaLength);
-				} else if (offset < eventOffset) {
-					// event extends over end of position - adjust length
-					int newEnd= eventOffset + eventNewLength;
-					position.setLength(newEnd - offset);
-				} else if (end > eventOffset + eventOldLength) {
-					// event extends from before position into it - adjust offset
-					// and length
-					// offset becomes end of event, length adjusted accordingly
-					// we want to recycle the overlapping part
-					position.setOffset(eventOffset);
-					int deleted= eventOffset + eventOldLength - offset;
-					position.setLength(length - deleted + eventNewLength);
-				} else {
-					// event consumes the position - delete it
-					position.delete();
-				}
-			}
-		} catch (BadPositionCategoryException e) {
-			// ignore and return
-		}
-	}
-
-	/**
-	 * Returns the position category.
-	 *
-	 * @return the position category
-	 */
-	public String getCategory() {
-		return fCategory;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/Messages.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/Messages.java
deleted file mode 100644
index 0fdf95c..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * TODO: Add Javadoc
- * @author dcarver
- *
- */
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.ui.internal.contentassist.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	/**
-	 * TODO: Add Javadoc
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/PositionBasedCompletionProposal.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/PositionBasedCompletionProposal.java
deleted file mode 100644
index a80a4c6..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/PositionBasedCompletionProposal.java
+++ /dev/null
@@ -1,188 +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
- *
- * Copied from the jface.templates package.
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-
-import org.eclipse.core.runtime.Assert;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension3;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-
-
-/**
- * An enhanced implementation of the <code>ICompletionProposal</code> interface implementing all the extension interfaces.
- *
- * @since 3.0
- */
-public class PositionBasedCompletionProposal implements ICompletionProposal, ICompletionProposalExtension2, ICompletionProposalExtension3 {
-
-	/** The string to be displayed in the completion proposal popup */
-	private String fDisplayString;
-	/** The replacement string */
-	private String fReplacementString;
-	/** The replacement position. */
-	private Position fReplacementPosition;
-	/** The cursor position after this proposal has been applied */
-	private int fCursorPosition;
-	/** The image to be displayed in the completion proposal popup */
-	private Image fImage;
-	/** The context information of this proposal */
-	private IContextInformation fContextInformation;
-	/** The additional info of this proposal */
-	private String fAdditionalProposalInfo;
-
-	/**
-	 * Creates a new completion proposal based on the provided information.  The replacement string is
-	 * considered being the display string too. All remaining fields are set to <code>null</code>.
-	 *
-	 * @param replacementString the actual string to be inserted into the document
-	 * @param replacementPosition the position of the text to be replaced
-	 * @param cursorPosition the position of the cursor following the insert relative to replacementOffset
-	 */
-	public PositionBasedCompletionProposal(String replacementString, Position replacementPosition, int cursorPosition) {
-		this(replacementString, replacementPosition, cursorPosition, null, null, null, null);
-	}
-
-	/**
-	 * Creates a new completion proposal. All fields are initialized based on the provided information.
-	 *
-	 * @param replacementString the actual string to be inserted into the document
-	 * @param replacementPosition the position of the text to be replaced
-	 * @param cursorPosition the position of the cursor following the insert relative to replacementOffset
-	 * @param image the image to display for this proposal
-	 * @param displayString the string to be displayed for the proposal
-	 * @param contextInformation the context information associated with this proposal
-	 * @param additionalProposalInfo the additional information associated with this proposal
-	 */
-	public PositionBasedCompletionProposal(String replacementString, Position replacementPosition, int cursorPosition, Image image, String displayString, IContextInformation contextInformation, String additionalProposalInfo) {
-		Assert.isNotNull(replacementString);
-		Assert.isTrue(replacementPosition != null);
-
-		fReplacementString= replacementString;
-		fReplacementPosition= replacementPosition;
-		fCursorPosition= cursorPosition;
-		fImage= image;
-		fDisplayString= displayString;
-		fContextInformation= contextInformation;
-		fAdditionalProposalInfo= additionalProposalInfo;
-	}
-
-	/*
-	 * @see ICompletionProposal#apply(IDocument)
-	 */
-	public void apply(IDocument document) {
-		try {
-			document.replace(fReplacementPosition.getOffset(), fReplacementPosition.getLength(), fReplacementString);
-		} catch (BadLocationException x) {
-			// ignore
-		}
-	}
-
-	/*
-	 * @see ICompletionProposal#getSelection(IDocument)
-	 */
-	public Point getSelection(IDocument document) {
-		return new Point(fReplacementPosition.getOffset() + fCursorPosition, 0);
-	}
-
-	/*
-	 * @see ICompletionProposal#getContextInformation()
-	 */
-	public IContextInformation getContextInformation() {
-		return fContextInformation;
-	}
-
-	/*
-	 * @see ICompletionProposal#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
-	 */
-	public String getDisplayString() {
-		if (fDisplayString != null)
-			return fDisplayString;
-		return fReplacementString;
-	}
-
-	/*
-	 * @see ICompletionProposal#getAdditionalProposalInfo()
-	 */
-	public String getAdditionalProposalInfo() {
-		return fAdditionalProposalInfo;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(org.eclipse.jface.text.ITextViewer, char, int, int)
-	 */
-	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
-		apply(viewer.getDocument());
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(org.eclipse.jface.text.ITextViewer, boolean)
-	 */
-	public void selected(ITextViewer viewer, boolean smartToggle) {
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(org.eclipse.jface.text.ITextViewer)
-	 */
-	public void unselected(ITextViewer viewer) {
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument, int, org.eclipse.jface.text.DocumentEvent)
-	 */
-	public boolean validate(IDocument document, int offset, DocumentEvent event) {
-		try {
-			String content= document.get(fReplacementPosition.getOffset(), offset - fReplacementPosition.getOffset());
-			if (fReplacementString.startsWith(content))
-				return true;
-		} catch (BadLocationException e) {
-			// ignore concurrently modified document
-		}
-		return false;
-	}
-
-	public IInformationControlCreator getInformationControlCreator() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public int getPrefixCompletionStart(IDocument document, int completionOffset) {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	public CharSequence getPrefixCompletionText(IDocument document,
-			int completionOffset) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XPathCustomTemplateProposal.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XPathCustomTemplateProposal.java
deleted file mode 100644
index 1aef9aa..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XPathCustomTemplateProposal.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension3;
-import org.eclipse.jface.text.link.LinkedModeModel;
-import org.eclipse.jface.text.link.LinkedModeUI;
-import org.eclipse.jface.text.link.LinkedPosition;
-import org.eclipse.jface.text.link.LinkedPositionGroup;
-import org.eclipse.jface.text.link.ProposalPosition;
-import org.eclipse.jface.text.templates.GlobalTemplateVariables;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateBuffer;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateException;
-import org.eclipse.jface.text.templates.TemplateProposal;
-import org.eclipse.jface.text.templates.TemplateVariable;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceCompletionProposal;
-
-/**
- * Purpose of this class is to make the additional proposal info into content
- * fit for an HTML viewer (by escaping characters)
- */
-class XPathCustomTemplateProposal extends TemplateProposal implements ICompletionProposalExtension, ICompletionProposalExtension2, ICompletionProposalExtension3, IRelevanceCompletionProposal {
-	// copies of this class exist in:
-	// org.eclipse.jst.jsp.ui.internal.contentassist
-	// org.eclipse.wst.html.ui.internal.contentassist
-	// org.eclipse.wst.xml.ui.internal.contentassist
-	// org.eclipse.wst.xsl.ui.internal.contentassist
-
-	private String fDisplayString = null;
-	private final Template fTemplate;
-	@SuppressWarnings("unused")
-	private IRegion fSelectedRegion; // initialized by apply()
-	private final TemplateContext fContext;
-	private IRegion fRegion; 
-	private InclusivePositionUpdater fUpdater;
-
-	
-	public XPathCustomTemplateProposal(Template template, TemplateContext context, IRegion region, Image image, int relevance) {
-		super(template, context, region, image, relevance);
-		
-			Assert.isNotNull(template);
-			Assert.isNotNull(context);
-			Assert.isNotNull(region);
-
-			fTemplate= template;
-			fDisplayString= null;
-			fContext = context;
-			fRegion = region;
-	}
-
-	public String getAdditionalProposalInfo() {
-		String additionalInfo = Messages.getString("XPathCustomTemplateProposal.1") + fTemplate.getDescription();  //$NON-NLS-1$
-		return additionalInfo;
-	}
-	
-	/*
-	 * @see ICompletionProposal#getDisplayString()
-	 */
-	public String getDisplayString() {
-		if (fDisplayString == null) {
-			fDisplayString = fTemplate.getName();
-		}
-		return fDisplayString;
-	}
-	
-	/**
-	 * @param viewer 
-	 * @param trigger 
-	 * @param stateMask 
-	 * @param offset 
-	 * 
-	 */
-	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) { 
-
-	    IDocument document = viewer.getDocument();
-	
-		try {
-			fContext.setReadOnly(false);
-			int start;
-			//int oldReplaceOffset= getReplaceOffset();
-			TemplateBuffer templateBuffer = fContext.evaluate(fTemplate);
-
-			start = offset;
-			int end = Math.max(getReplaceEndOffset(), offset);
-
-			// insert template string
-			String templateString= templateBuffer.getString();
-			document.replace(start, end - start, templateString);
-			
-			// translate positions
-			LinkedModeModel model= new LinkedModeModel();
-			TemplateVariable[] variables= templateBuffer.getVariables();
-			boolean hasPositions= false;
-			for (int i= 0; i != variables.length; i++) {
-				TemplateVariable variable= variables[i];
-
-//				if (variable.isUnambiguous())
-//					continue;
-
-				LinkedPositionGroup group= new LinkedPositionGroup();
-
-				int[] offsets= variable.getOffsets();
-				int length= variable.getLength();
-
-				LinkedPosition first = getFirst(variable, start, variable.getOffsets(), length, document);
-
-				for (int j= 0; j != offsets.length; j++)
-					if (j == 0)
-						group.addPosition(first);
-					else
-						group.addPosition(new LinkedPosition(document, offsets[j] + start, length));
-
-				model.addGroup(group);
-				hasPositions= true;
-			}
-
-			if (hasPositions) {
-				model.forceInstall();
-				LinkedModeUI ui= new LinkedModeUI(model, viewer);
-				ui.setExitPosition(viewer, getCaretOffset(templateBuffer) + start, 0, Integer.MAX_VALUE);
-				ui.enter();
-
-				fSelectedRegion= ui.getSelectedRegion();
-			} else {
-				ensurePositionCategoryRemoved(document);
-				fSelectedRegion= new Region(getCaretOffset(templateBuffer) + start, 0);
-			}
-			
-		} catch (BadLocationException ex) {
-			fSelectedRegion = fRegion;
-//		} catch (BadPositionCategoryException bex) {
-//			fSelectedRegion = fRegion;
-		} catch (TemplateException tex) {
-			fSelectedRegion = fRegion;
-		}
-
-	}
-	
-	private LinkedPosition getFirst(TemplateVariable variable, int start, int[] offsets, int length, IDocument document ) {
-		String[] values= variable.getValues();
-		LinkedPosition first;
-		ICompletionProposal[] proposals= new ICompletionProposal[values.length];
-		try {
-			for (int j= 0; j < values.length; j++) {
-				//ensurePositionCategoryInstalled(document, model);
-				Position pos= new Position(offsets[0] + start, length);
-				document.addPosition(pos);
-				//document.addPosition(getCategory(), pos);
-				proposals[j]= new PositionBasedCompletionProposal(values[j], pos, length);
-			}
-		} catch (BadLocationException ex) {
-			
-		}
-		
-		if (proposals.length > 1)
-			first= new ProposalPosition(document, offsets[0] + start, length, proposals);
-		else
-			first= new LinkedPosition(document, offsets[0] + start, length);
-		return first;
-	}
-	
-//	private void ensurePositionCategoryInstalled(final IDocument document, LinkedModeModel model) {
-//		if (!document.containsPositionCategory(getCategory())) {
-//			document.addPositionCategory(getCategory());
-//			fUpdater= new InclusivePositionUpdater(getCategory());
-//			document.addPositionUpdater(fUpdater);
-//
-//			model.addLinkingListener(new ILinkedModeListener() {
-//
-//				/*
-//				 * @see org.eclipse.jface.text.link.ILinkedModeListener#left(org.eclipse.jface.text.link.LinkedModeModel, int)
-//				 */
-//				public void left(LinkedModeModel environment, int flags) {
-//					ensurePositionCategoryRemoved(document);
-//				}
-//
-//				public void suspend(LinkedModeModel environment) {}
-//				public void resume(LinkedModeModel environment, int flags) {}
-//			});
-//		}
-//	}
-
-	private void ensurePositionCategoryRemoved(IDocument document) {
-		if (document.containsPositionCategory(getCategory())) {
-			try {
-				document.removePositionCategory(getCategory());
-			} catch (BadPositionCategoryException e) {
-				// ignore
-			}
-			document.removePositionUpdater(fUpdater);
-		}
-	}
-
-	private String getCategory() {
-		return "TemplateProposalCategory_TemplateProposal"; //$NON-NLS-1$
-	}
-
-	private int getCaretOffset(TemplateBuffer buffer) {
-
-	    TemplateVariable[] variables= buffer.getVariables();
-		for (int i= 0; i != variables.length; i++) {
-			TemplateVariable variable= variables[i];
-			if (variable.getType().equals(GlobalTemplateVariables.Cursor.NAME))
-				return variable.getOffsets()[0];
-		}
-
-		return buffer.getString().length();
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XPathTemplateCompletionProcessor.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XPathTemplateCompletionProcessor.java
deleted file mode 100755
index 2b83e97..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XPathTemplateCompletionProcessor.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Based on org.eclipse.wst.xml.ui.internal.contentassist.XMLTemplateCompletionProcessor
- * Contributors:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-
-//import java.util.Comparator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.TemplateException;
-import org.eclipse.jface.text.templates.TemplateProposal;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xml.ui.internal.contentassist.ReplaceNameTemplateContext;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-import org.eclipse.wst.xsl.ui.internal.templates.TemplateContextTypeIdsXPath;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImageHelper;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImages;
-
-
-/**
- * Completion processor for XPath Templates. Most of the work is already done by
- * the XSL Content Assist processor, so by the time the
- * XPathTemplateCompletionProcessor is asked for content assist proposals, the
- * XSL content assist processor has already set the context type for
- * templates.
- * 
- * @see org.eclipse.wst.xml.ui.
- * @since 0.5M6
- */
-class XPathTemplateCompletionProcessor extends TemplateCompletionProcessor {
-	@SuppressWarnings("unchecked")
-	private static final class ProposalComparator implements Comparator {
-		public int compare(Object o1, Object o2) {
-			return ((TemplateProposal) o2).getRelevance() - ((TemplateProposal) o1).getRelevance();
-		}
-	}
-
-	private String fContextTypeId = null;
-	@SuppressWarnings("unchecked")
-	private static final Comparator fgProposalComparator= new ProposalComparator();
-
-
-	protected ICompletionProposal createProposal(Template template, TemplateContext context, IRegion region, int relevance) {
-		return new XPathCustomTemplateProposal(template, context, region, getImage(template), relevance);
-	}
-
-	protected TemplateContextType getContextType(ITextViewer viewer, IRegion region) {
-		TemplateContextType type = null;
-
-		ContextTypeRegistry registry = getTemplateContextRegistry();
-		if (registry != null) {
-			type = registry.getContextType(fContextTypeId);
-		}
-
-		return type;
-	}
-
-	protected Image getImage(Template template) {
-		// just return the same image for now
-		Image returnImage = null;
-		if (TemplateContextTypeIdsXPath.AXIS.equals(template.getContextTypeId())) {
-			returnImage = XSLPluginImageHelper.getInstance().getImage(XSLPluginImages.IMG_XPATH_AXIS); 
-		} else if (TemplateContextTypeIdsXPath.XPATH.equals(template.getContextTypeId())) {
-			returnImage = XSLPluginImageHelper.getInstance().getImage(XSLPluginImages.IMG_XPATH_FUNCTION);
-		} else if (TemplateContextTypeIdsXPath.OPERATOR.equals(template.getContextTypeId())) {
-			returnImage = XSLPluginImageHelper.getInstance().getImage(XSLPluginImages.IMG_OPERATOR);
-		}
-		return returnImage; 
-	}
-
-	private ContextTypeRegistry getTemplateContextRegistry() {
-		return XSLUIPlugin.getDefault().getXPathTemplateContextRegistry();
-	}
-
-	protected Template[] getTemplates(String contextTypeId) {
-		Template templates[] = null;
-
-		TemplateStore store = getTemplateStore();
-		if (store != null) {
-			templates = store.getTemplates(contextTypeId);
-		}
-
-		return templates;
-	}
-
-	private TemplateStore getTemplateStore() {
-		return XSLUIPlugin.getDefault().getXPathTemplateStore();
-	}
-
-	void setContextType(String contextTypeId) {
-		fContextTypeId = contextTypeId;
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer,
-	 *      int)
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
-
-		ITextSelection selection= (ITextSelection) viewer.getSelectionProvider().getSelection();
-
-		// adjust offset to end of normalized selection
-		if (selection.getOffset() == offset)
-			offset= selection.getOffset() + selection.getLength();
-
-		String prefix= extractPrefix(viewer, offset);
-		Region region= new Region(offset - prefix.length(), prefix.length());
-		TemplateContext context = createContext(viewer, region, offset);
-		if (context == null)
-			return new ICompletionProposal[0];
-
-		context.setVariable("selection", selection.getText()); // name of the selection variables {line, word}_selection //$NON-NLS-1$
-
-		Template[] templates= getTemplates(context.getContextType().getId());
-
-		List matches= new ArrayList();
-		for (int i= 0; i < templates.length; i++) {
-			Template template= templates[i];
-			try {
-				context.getContextType().validate(template.getPattern());
-			} catch (TemplateException e) {
-				continue;
-			}
-			if (template.matches(prefix, context.getContextType().getId()))
-				matches.add(createProposal(template, context, (IRegion) region, getRelevance(template, prefix)));
-		}
-
-		Collections.sort(matches, fgProposalComparator);
-
-		return (ICompletionProposal[]) matches.toArray(new ICompletionProposal[matches.size()]);
-	}
-
-	/**
-	 * Creates a concrete template context for the given region in the
-	 * document. This involves finding out which context type is valid at the
-	 * given location, and then creating a context of this type. The default
-	 * implementation returns a <code>SmartReplaceTemplateContext</code> for
-	 * the context type at the given location. This takes the offset at which
-	 * content assist was invoked into consideration.
-	 * 
-	 * @param viewer
-	 *            the viewer for which the context is created
-	 * @param region
-	 *            the region into <code>document</code> for which the
-	 *            context is created
-	 * @param offset
-	 *            the original offset where content assist was invoked
-	 * @return a template context that can handle template insertion at the
-	 *         given location, or <code>null</code>
-	 */
-	private TemplateContext createContext(ITextViewer viewer, IRegion region, int offset) {
-		// pretty much same code as super.createContext except create
-		// SmartReplaceTemplateContext
-		TemplateContextType contextType = getContextType(viewer, region);
-		if (contextType != null) {
-			IDocument document = viewer.getDocument();
-			return new ReplaceNameTemplateContext(contextType, document, region.getOffset(), region.getLength(), offset);
-		}
-		return null;
-	}
-	
-//	/**
-//	 * 
-//	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
-//	 */
-//	@Override
-//	public char[] getCompletionProposalAutoActivationCharacters() {
-//		char apostrophe = '\'';
-//		char quote = '"';
-//		char[] autoProposal = {apostrophe, quote};
-//		return autoProposal;
-//	}
-	
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistProcessor.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistProcessor.java
deleted file mode 100644
index 37ef363..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistProcessor.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.xpath.XPathAPI;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest;
-import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentAssistProcessor;
-import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-import org.eclipse.wst.xsl.ui.internal.templates.TemplateContextTypeIdsXPath;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImageHelper;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImages;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * The XSL Content Assist Processor provides content assistance for various
- * attributes values within the XSL Editor. This includes support for xpaths on
- * select statements as well as on test and match attributes.
- * 
- * @author David Carver
- * 
- */
-@SuppressWarnings("restriction")//$NON-NLS-1$
-public class XSLContentAssistProcessor extends XMLContentAssistProcessor
-		implements IPropertyChangeListener {
-
-	private static final String ATTR_SELECT = "select"; //$NON-NLS-1$
-	private static final String ATTR_TEST = "test"; //$NON-NLS-1$
-	private static final String ATTR_MATCH = "match"; //$NON-NLS-1$
-	/**
-	 * Retireve all global variables in the stylesheet.
-	 */
-	private static final String XPATH_GLOBAL_VARIABLES = "/xsl:stylesheet/xsl:variable"; //$NON-NLS-1$
-
-	/**
-	 * Retrieve all global parameters in the stylesheet.
-	 */
-	private static final String XPATH_GLOBAL_PARAMS = "/xsl:stylesheet/xsl:param"; //$NON-NLS-1$
-
-	/**
-	 * Limit selection of variables to those that are in the local scope.
-	 */
-	private static final String XPATH_LOCAL_VARIABLES = "ancestor::xsl:template/descendant::xsl:variable"; //$NON-NLS-1$
-
-	/**
-	 * Limit selection of params to those that are in the local scope.
-	 */
-	private static final String XPATH_LOCAL_PARAMS = "ancestor::xsl:template/descendant::xsl:param"; //$NON-NLS-1$
-
-	/**
-	 * XSL Namespace. We rely on the namespace not the prefix for
-	 * identification.
-	 */
-	private String xslNamespace = "http://www.w3.org/1999/XSL/Transform"; //$NON-NLS-1$
-
-	protected IPreferenceStore fPreferenceStore = null;
-	protected IResource fResource = null;
-	private XPathTemplateCompletionProcessor fTemplateProcessor = null;
-	private List<String> fTemplateContexts = new ArrayList<String>();
-	private static final byte[] XPATH_LOCK = new byte[0];
-
-	/**
-	 * The XSL Content Assist Processor handles XSL specific functionality for
-	 * content assistance. It leverages several XPath selection variables to
-	 * help with the selection of elements and template names.
-	 * 
-	 */
-	public XSLContentAssistProcessor() {
-		super();
-	}
-
-	/**
-	 * Adds Attribute proposals based on the element and the attribute where the
-	 * content proposal was instantiated.
-	 * 
-	 * @param contentAssistRequest
-	 *            Content Assist Request that initiated the proposal request
-	 * 
-	 */
-	@Override
-	protected void addAttributeValueProposals(
-			ContentAssistRequest contentAssistRequest) {
-		// Make sure to handle any existing Content Assist based on Attributes
-		// for XML content.
-		super.addAttributeValueProposals(contentAssistRequest);
-		IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
-		String namespace = DOMNamespaceHelper.getNamespaceURI(node);
-
-		// String nodeName =
-		// DOMNamespaceHelper.getUnprefixedName(node.getNodeName());
-		String attributeName = getAttributeName(contentAssistRequest);
-
-		// Retrieve the Editor so that we may get a w3c DOM representation of
-		// the document.
-		IEditorPart editor = Workbench.getInstance().getActiveWorkbenchWindow()
-				.getActivePage().getActiveEditor();
-		IStructuredModel model = this.getEditorModel(editor);
-		Document document = (Document) model.getAdapter(Document.class);
-		Element rootElement = (IDOMElement) document.getDocumentElement();
-
-		if (attributeName != null) {
-			int offset = contentAssistRequest.getStartOffset() + 1;
-
-			// Check and see if we are dealing with a non XML namespace request.
-			// If so then
-			// allow content assistance if the text contains { which signals
-			// that a value-of
-			// replacement should be done in an attribute.
-			addAttributeValueOfProposals(contentAssistRequest, node, namespace,
-					rootElement, offset);
-
-			// Current node belongs in the XSL Namespace. We only want to do
-			// this
-			// for the namespace. Regardless of what the prefix is set too.
-			if (namespace != null) {
-				if (namespace.equals(this.xslNamespace)) {
-					// Adjust the offset so we don't overwrite the " due to the
-					// fact that SSE includes " in the value region for
-					// attributes.
-					if (attributeName.equals(ATTR_SELECT)
-							|| attributeName.equals(ATTR_TEST)) {
-						addGlobalProposals(rootElement, contentAssistRequest,
-								offset);
-						addLocalProposals(node, contentAssistRequest, offset);
-						addTemplates(contentAssistRequest,
-								TemplateContextTypeIdsXPath.AXIS, offset);
-						addTemplates(contentAssistRequest,
-								TemplateContextTypeIdsXPath.XPATH, offset);
-						addTemplates(contentAssistRequest,
-								TemplateContextTypeIdsXPath.CUSTOM, offset);
-					}
-
-					// Add the common XPath proposals to Select, Test, and Match
-					// attributes that
-					// appear in the xsl namespace.
-					if (attributeName.equals(ATTR_MATCH)) {
-						addTemplates(contentAssistRequest,
-								TemplateContextTypeIdsXPath.AXIS, offset);
-						addTemplates(contentAssistRequest,
-								TemplateContextTypeIdsXPath.XPATH, offset);
-//						addTemplates(contentAssistRequest,
-//								TemplateContextTypeIdsXPath.OPERATOR, offset);
-						addTemplates(contentAssistRequest,
-								TemplateContextTypeIdsXPath.CUSTOM, offset);
-					}
-
-					// Operators like And, Or, greater than, are more likely to
-					// be used in test statements
-//					if (attributeName.equals(ATTR_TEST)) {
-//						addTemplates(contentAssistRequest,
-//								TemplateContextTypeIdsXPath.OPERATOR, offset);
-//					}
-
-					// Match attributes probably need to get a listing of all
-					// available elements from the
-					// content model by namespace so that those values can be
-					// added as possible content assistance
-
-				}
-			}
-		}
-	}
-
-	private void addAttributeValueOfProposals(
-			ContentAssistRequest contentAssistRequest, IDOMNode node,
-			String namespace, Element rootElement, int offset) {
-		if (contentAssistRequest.getMatchString().contains("{")) {
-			// Need to relook at Variable proposal code to make sure that the
-			// curspor position doesn't replace
-			// the entire contents. This should work the same way as teh
-			// template proposals.
-			addGlobalProposals(rootElement, contentAssistRequest,
-					contentAssistRequest.getReplacementBeginPosition());
-			addLocalProposals(node, contentAssistRequest, contentAssistRequest
-					.getReplacementBeginPosition());
-			addTemplates(contentAssistRequest,
-					TemplateContextTypeIdsXPath.AXIS, offset);
-			addTemplates(contentAssistRequest,
-					TemplateContextTypeIdsXPath.XPATH, offset);
-			addTemplates(contentAssistRequest,
-					TemplateContextTypeIdsXPath.CUSTOM, offset);
-			
-		}
-	}
-
-	private void addLocalProposals(Node xpathnode,
-			ContentAssistRequest contentAssistRequest, int offset) {
-		addvariablesProposals(XPATH_LOCAL_VARIABLES, xpathnode,
-				contentAssistRequest, offset);
-		addvariablesProposals(XPATH_LOCAL_PARAMS, xpathnode,
-				contentAssistRequest, offset);
-	}
-
-	private void addGlobalProposals(Node xpathnode,
-			ContentAssistRequest contentAssistRequest, int offset) {
-		addvariablesProposals(XPATH_GLOBAL_VARIABLES, xpathnode,
-				contentAssistRequest, offset);
-		addvariablesProposals(XPATH_GLOBAL_PARAMS, xpathnode,
-				contentAssistRequest, offset);
-	}
-
-	/**
-	 * addvariableProposals adds Parameter and Variables as proposals. This
-	 * information is selected based on the XPath statement that is sent to it
-	 * and the input Node passed. It uses a custom composer to XSL Variable
-	 * proposal.
-	 * 
-	 * @param xpath
-	 * @param xpathnode
-	 * @param contentAssistRequest
-	 * @param offset
-	 */
-	private void addvariablesProposals(String xpath, Node xpathnode,
-			ContentAssistRequest contentAssistRequest, int offset) {
-		synchronized (XPATH_LOCK) {
-			try {
-				NodeList nodes = XPathAPI.selectNodeList(xpathnode, xpath);
-				
-			
-				// Get the current cursor position, this is not the same as the offset
-				// Since content assist assumes you want to replace everything, you need to calculate
-				// where the cursor should end up.  This is helpful for when the PrositionBasedCompletionProposal
-				// is called later to apply the request item.
-				int currentCursorPosition = fTextViewer.getTextWidget().getCaretOffset();
-				int startOffset = offset;
-				// Calculate the length from the beginning to current cursor position.
-				int startLength = currentCursorPosition - startOffset;
-				
-				
-				if (nodes != null && nodes.getLength() > 0) {
-					for (int nodecnt = 0; nodecnt < nodes.getLength(); nodecnt++) {
-						Node node = nodes.item(nodecnt);
-						String variableName = "$" + node.getAttributes().getNamedItem("name").getNodeValue(); //$NON-NLS-1$ //$NON-NLS-2$
-						
-						// The cursor position is calculated based on the length of the string to the current position
-						// plus the length of the text that will be inserted.
-						XSLVariableCustomCompletionProposal proposal = new XSLVariableCustomCompletionProposal(
-								variableName, offset, 0, startLength + variableName.length(),
-								XSLPluginImageHelper.getInstance().getImage(
-										XSLPluginImages.IMG_VARIABLES),
-								variableName, null, null, 0);
-						contentAssistRequest.addProposal(proposal);
-					}
-				}
-
-			} catch (TransformerException ex) {
-				XSLUIPlugin.log(ex);
-			}
-		}
-	}
-
-	/**
-	 * Adds templates to the list of proposals
-	 * 
-	 * @param contentAssistRequest
-	 * @param context
-	 */
-	private void addTemplates(ContentAssistRequest contentAssistRequest,
-			String context) {
-		addTemplates(contentAssistRequest, context, contentAssistRequest
-				.getReplacementBeginPosition());
-	}
-
-	/**
-	 * Adds XPath related templates to the list of proposals
-	 * 
-	 * @param contentAssistRequest
-	 * @param context
-	 * @param startOffset
-	 */
-	private void addTemplates(ContentAssistRequest contentAssistRequest,
-			String context, int startOffset) {
-		if (contentAssistRequest == null) {
-			return;
-		}
-
-		// if already adding template proposals for a certain context type, do
-		// not add again
-		if (!fTemplateContexts.contains(context)) {
-			fTemplateContexts.add(context);
-			boolean useProposalList = !contentAssistRequest.shouldSeparate();
-
-			if (getTemplateCompletionProcessor() != null) {
-				getTemplateCompletionProcessor().setContextType(context);
-				ICompletionProposal[] proposals = getTemplateCompletionProcessor()
-						.computeCompletionProposals(fTextViewer, startOffset);
-				for (int i = 0; i < proposals.length; ++i) {
-					if (useProposalList) {
-						contentAssistRequest.addProposal(proposals[i]);
-					} else {
-						contentAssistRequest.addMacro(proposals[i]);
-					}
-				}
-			}
-		}
-	}
-
-	private XPathTemplateCompletionProcessor getTemplateCompletionProcessor() {
-		if (fTemplateProcessor == null) {
-			fTemplateProcessor = new XPathTemplateCompletionProcessor();
-		}
-		return fTemplateProcessor;
-	}
-
-	/**
-	 * Gets the attribute name that the content assist was triggered on.
-	 * 
-	 * @param contentAssistRequest
-	 * @return
-	 */
-	private String getAttributeName(ContentAssistRequest contentAssistRequest) {
-		// Find the attribute region and name for which this position should
-		// have a value proposed
-		String attributeName = null;
-		IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
-		IStructuredDocumentRegion open = node
-				.getFirstStructuredDocumentRegion();
-		ITextRegionList openRegions = open.getRegions();
-		int i = openRegions.indexOf(contentAssistRequest.getRegion());
-		if (i >= 0) {
-
-			ITextRegion nameRegion = null;
-			while (i >= 0) {
-				nameRegion = openRegions.get(i--);
-				if (nameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-					break;
-				}
-			}
-
-			// String attributeName = nameRegion.getText();
-			attributeName = open.getText(nameRegion);
-		}
-		return attributeName;
-	}
-
-	protected ContentAssistRequest computeCompletionProposals(
-			int documentPosition, String matchString,
-			ITextRegion completionRegion, IDOMNode treeNode, IDOMNode xmlnode) {
-		return super.computeCompletionProposals(documentPosition, matchString,
-				completionRegion, treeNode, xmlnode);
-	}
-
-	/**
-	 * TODO: Add Javadoc
-	 * 
-	 * @param textViewer
-	 * @param documentPosition
-	 * @return
-	 * 
-	 * @see org.eclipse.wst.xml.ui.contentassist.AbstractContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer,
-	 *      int)
-	 */
-	public ICompletionProposal[] computeCompletionProposals(
-			ITextViewer textViewer, int documentPosition) {
-		fTemplateContexts.clear();
-		return super.computeCompletionProposals(textViewer, documentPosition);
-	}
-
-	protected IPreferenceStore getPreferenceStore() {
-		if (fPreferenceStore == null) {
-			fPreferenceStore = XSLUIPlugin.getDefault().getPreferenceStore();
-		}
-		return fPreferenceStore;
-	}
-
-	protected void init() {
-		super.getPreferenceStore().addPropertyChangeListener(this);
-		reinit();
-	}
-
-	/**
-	 * @param event
-	 * 
-	 */
-	public void propertyChange(PropertyChangeEvent event) {
-		String property = event.getProperty();
-
-		if ((property.compareTo(XMLUIPreferenceNames.AUTO_PROPOSE) == 0)
-				|| (property.compareTo(XMLUIPreferenceNames.AUTO_PROPOSE_CODE) == 0)) {
-			reinit();
-		}
-	}
-
-	protected void reinit() {
-		String key = XMLUIPreferenceNames.AUTO_PROPOSE;
-		boolean doAuto = super.getPreferenceStore().getBoolean(key);
-		if (doAuto) {
-			key = XMLUIPreferenceNames.AUTO_PROPOSE_CODE;
-			completionProposalAutoActivationCharacters = super
-					.getPreferenceStore().getString(key).toCharArray();
-		} else {
-			completionProposalAutoActivationCharacters = null;
-		}
-	}
-
-	private IStructuredModel getEditorModel(IEditorPart editor) {
-		return (IStructuredModel) editor.getAdapter(IStructuredModel.class);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLVariableCustomCompletionProposal.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLVariableCustomCompletionProposal.java
deleted file mode 100644
index b07043b..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLVariableCustomCompletionProposal.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.ITextViewerExtension5;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-
-/**
- * @author dcarver
- *
- */
-public class XSLVariableCustomCompletionProposal extends CustomCompletionProposal {
-
-	/**
-	 * @param replacementString
-	 * @param replacementOffset
-	 * @param replacementLength
-	 * @param cursorPosition
-	 * @param image
-	 * @param displayString
-	 * @param contextInformation
-	 * @param additionalProposalInfo
-	 * @param relevance
-	 * @param updateReplacementLengthOnValidate
-	 */
-	public XSLVariableCustomCompletionProposal(String replacementString,
-			int replacementOffset, int replacementLength, int cursorPosition,
-			Image image, String displayString,
-			IContextInformation contextInformation,
-			String additionalProposalInfo, int relevance,
-			boolean updateReplacementLengthOnValidate) {
-		super(replacementString, replacementOffset, replacementLength,
-				cursorPosition, image, displayString, contextInformation,
-				additionalProposalInfo, relevance,
-				updateReplacementLengthOnValidate);
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * @param replacementString
-	 * @param replacementOffset
-	 * @param replacementLength
-	 * @param cursorPosition
-	 * @param image
-	 * @param displayString
-	 * @param contextInformation
-	 * @param additionalProposalInfo
-	 * @param relevance
-	 */
-	public XSLVariableCustomCompletionProposal(String replacementString,
-			int replacementOffset, int replacementLength, int cursorPosition,
-			Image image, String displayString,
-			IContextInformation contextInformation,
-			String additionalProposalInfo, int relevance) {
-		super(replacementString, replacementOffset, replacementLength,
-				cursorPosition, image, displayString, contextInformation,
-				additionalProposalInfo, relevance);
-		// TODO Auto-generated constructor stub
-	}
-	
-	/** 
-	 * Create a positional based Proposal and replace the text at that position.
-	 * @see org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal#apply(org.eclipse.jface.text.ITextViewer, char, int, int)
-	 */
-	@Override
-	public void apply(ITextViewer viewer, char trigger, int stateMask,
-			int offset) {
-		// TODO Auto-generated method stub
-//		super.apply(viewer, trigger, stateMask, offset);
-		IStructuredDocument document = (IStructuredDocument)viewer.getDocument();
-		Position position = new Position(offset);
-	    int currentPosition =  getCursorPosition();
-	    int startOffset = document.getRegionAtCharacterOffset(offset).getStart();
-	    int existingLength = offset - startOffset;
-	    
-//		DC: Allows for replacement of text typed to this point.		
-//	    try {
-//			int caretOffset = viewer.getTextWidget().getCaretOffset();
-//			if (viewer instanceof ITextViewerExtension5) {
-//				ITextViewerExtension5 extension = (ITextViewerExtension5) viewer;
-//				caretOffset = extension.widgetOffset2ModelOffset(caretOffset);
-//			}
-//			else {
-//				caretOffset = viewer.getTextWidget().getCaretOffset() + viewer.getVisibleRegion().getOffset();
-//			}
-//
-//
-//			int endOffsetOfChanges = getReplacementString().length() + getReplacementOffset();
-//			// Insert the portion of the new text that comes after the
-//			// current caret position
-//			if (endOffsetOfChanges >= caretOffset) {
-//				int postCaretReplacementLength = getReplacementOffset() + getReplacementLength() - caretOffset;
-//				int preCaretReplacementLength = getReplacementString().length() - (endOffsetOfChanges - caretOffset);
-//				if (postCaretReplacementLength < 0) {
-//					if (Debug.displayWarnings) {
-//						System.out.println("** postCaretReplacementLength was negative: " + postCaretReplacementLength); //$NON-NLS-1$
-//					}
-//					// This is just a quick fix while I figure out what
-//					// replacement length is supposed to be
-//					// in each case, otherwise we'll get negative
-//					// replacment length sometimes
-//					postCaretReplacementLength = 0;
-//				}
-//				document.replace(caretOffset, postCaretReplacementLength, getReplacementString().substring(preCaretReplacementLength));
-//			}
-//			// Insert the portion of the new text that comes before the
-//			// current caret position
-//			// Done second since offsets would change for the post text
-//			// otherwise
-//			// Outright insertions are handled here
-//			if (caretOffset > getReplacementOffset()) {
-//				int preCaretTextLength = caretOffset - getReplacementOffset();
-//				document.replace(getReplacementOffset(), preCaretTextLength, getReplacementString().substring(0, preCaretTextLength));
-//			}
-//		}
-//		catch (BadLocationException x) {
-//			apply(document);
-//		}
-//		catch (StringIndexOutOfBoundsException e) {
-//			apply(document);
-//		}
-//
-	    
-		PositionBasedCompletionProposal proposal = 
-			new PositionBasedCompletionProposal(getReplacementString(), position, existingLength + getReplacementString().length());
-		proposal.apply(document);
-//	    apply(document);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/messages.properties b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/messages.properties
deleted file mode 100644
index 67591fe..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-XPathCustomTemplateProposal.1=Description:\r\n
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/SourceFileHyperlink.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/SourceFileHyperlink.java
deleted file mode 100644
index 8f82409..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/SourceFileHyperlink.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.editor;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.xsl.core.internal.model.XSLNode;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-class SourceFileHyperlink implements IHyperlink
-{
-	private IRegion hyperLinkRegion;
-	private IFile linkedFile;
-	private XSLNode sourceArtifact;
-
-	public SourceFileHyperlink(IRegion hyperLinkRegion, IFile linkedFile)
-	{
-		this.hyperLinkRegion = hyperLinkRegion;
-		this.linkedFile = linkedFile;
-	}
-
-	public SourceFileHyperlink(IRegion hyperLinkRegion, IFile linkedFile, XSLNode node)
-	{
-		this.hyperLinkRegion = hyperLinkRegion;
-		this.linkedFile = linkedFile;
-		this.sourceArtifact = node;
-	}
-
-	public IRegion getHyperlinkRegion()
-	{
-		return hyperLinkRegion;
-	}
-
-	public String getTypeLabel()
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getHyperlinkText()
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void open()
-	{
-		if (linkedFile != null && linkedFile.exists())
-		{
-			try
-			{
-				IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-				IEditorPart editor = IDE.openEditor(page, linkedFile, true);
-				ITextEditor textEditor = (ITextEditor)editor.getAdapter(ITextEditor.class);
-				if (sourceArtifact != null && textEditor != null)
-				{
-					IDocument openedDocument = (IDocument)editor.getAdapter(IDocument.class);
-					if (openedDocument != null)
-					{
-						int lineOffset = openedDocument.getLineOffset(sourceArtifact.getLineNumber());
-						int offset = lineOffset + sourceArtifact.getColumnNumber();
-						//textEditor.selectAndReveal(offset, sourceArtifact.getLength());
-						textEditor.setHighlightRange(offset, sourceArtifact.getLength(), true);
-					}
-				}
-			}
-			catch (PartInitException pie)
-			{
-				XSLUIPlugin.log(pie);
-			}
-			catch (BadLocationException e)
-			{
-				XSLUIPlugin.log(e);
-			}
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/XSLHyperlinkDetector.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/XSLHyperlinkDetector.java
deleted file mode 100644
index 867898d..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/XSLHyperlinkDetector.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.editor;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.model.StylesheetModel;
-import org.eclipse.wst.xsl.core.internal.model.Template;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * A hyperlink detector for XSL files.
- * 
- * The detector makes use of the model built by SSE validation (found in <code>XSLCore</code>).
- * 
- * Currently supports hyperlinking for includes, imports or called templates.
- * 
- * @author Doug Satchwell
- */
-public class XSLHyperlinkDetector extends AbstractHyperlinkDetector
-{
-	/**
-	 * Try to create hyperlinks for viewer and region
-	 * 
-	 * @see AbstractHyperlinkDetector
-	 * @param textViewer 
-	 * @param region 
-	 * @param canShowMultipleHyperlinks 
-	 * @return array of hyperlinks for current region
-	 */
-	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks)
-	{
-		IHyperlink hyperlink = null;
-		
-		if (region != null && textViewer != null)
-		{
-			IDocument document = textViewer.getDocument();
-			Node currentNode = getCurrentNode(document, region.getOffset());
-
-			Element xslEl = null;
-			Attr xslAttr = null;
-			if (currentNode.getNodeType() == Node.ATTRIBUTE_NODE)
-			{
-				Attr att = (Attr) currentNode;
-				if (XSLCore.XSL_NAMESPACE_URI.equals(att.getOwnerElement().getNamespaceURI()))
-				{
-					xslEl = att.getOwnerElement();
-					xslAttr = att;
-				}
-			}
-			else if (currentNode.getNodeType() == Node.ELEMENT_NODE)
-			{
-				Element el = (Element)currentNode;
-				if (XSLCore.XSL_NAMESPACE_URI.equals(el.getNamespaceURI()))
-				{
-					xslEl = el;
-					xslAttr = getCurrentAttrNode(el, region.getOffset());
-				}
-			}
-			// try to create hyperlink from information gathered
-			if (xslEl != null && xslAttr != null)
-			{
-				IRegion hyperlinkRegion = getHyperlinkRegion(xslAttr);
-				IFile file = getFileForDocument(document);
-				if (file != null)
-				{
-					if ("call-template".equals(xslEl.getLocalName()) && "name".equals(xslAttr.getLocalName()))
-					{
-						hyperlink = createCallTemplateHyperLink(file,xslAttr.getValue(), hyperlinkRegion);
-					}
-					else if (("include".equals(xslEl.getLocalName()) || "import".equals(xslEl.getLocalName()))
-						&& "href".equals(xslAttr.getLocalName()))
-					{
-						hyperlink = createIncludeHyperLink(file,xslAttr.getValue(), hyperlinkRegion);
-					}
-				}
-			}
-		}
-		return hyperlink == null ? null : new IHyperlink[]{hyperlink};
-	}
-
-	private IHyperlink createIncludeHyperLink(IFile currentFile, String include, IRegion hyperlinkRegion)
-	{
-		IHyperlink hyperlink = null;
-		IFile linkedFile = XSLCore.resolveFile(currentFile, include);
-		if (linkedFile != null && linkedFile.exists())
-			hyperlink = new SourceFileHyperlink(hyperlinkRegion,linkedFile);
-		return hyperlink;
-	}
-
-	private IHyperlink createCallTemplateHyperLink(IFile currentFile, String templateName, IRegion hyperlinkRegion)
-	{
-		IHyperlink hyperlink = null;
-		StylesheetModel sf = XSLCore.getInstance().getStylesheet(currentFile);
-		if (sf != null)
-		{
-			List<Template> templates = sf.getTemplatesByName(templateName);
-			if (templates != null && templates.size() == 1)
-			{
-				Template template = templates.get(0);
-				hyperlink = new SourceFileHyperlink(hyperlinkRegion,template.getStylesheet().getFile(),template);
-			}
-		}
-		return hyperlink;
-	}
-
-	private Attr getCurrentAttrNode(Node node, int offset)
-	{
-		if ((node instanceof IndexedRegion) && ((IndexedRegion) node).contains(offset) && (node.hasAttributes()))
-		{
-			NamedNodeMap attrs = node.getAttributes();
-			for (int i = 0; i < attrs.getLength(); ++i)
-			{
-				IndexedRegion attRegion = (IndexedRegion) attrs.item(i);
-				if (attRegion.contains(offset))
-				{
-					return (Attr) attrs.item(i);
-				}
-			}
-		}
-		return null;
-	}
-
-	private Node getCurrentNode(IDocument document, int offset)
-	{
-		IndexedRegion inode = null;
-		IStructuredModel sModel = null;
-		try
-		{
-			sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			inode = sModel.getIndexedRegion(offset);
-			if (inode == null)
-				inode = sModel.getIndexedRegion(offset - 1);
-		}
-		finally
-		{
-			if (sModel != null)
-				sModel.releaseFromRead();
-		}
-
-		if (inode instanceof Node)
-		{
-			return (Node) inode;
-		}
-		return null;
-	}
-
-	private IRegion getHyperlinkRegion(Node node)
-	{
-		IRegion hyperRegion = null;
-
-		if (node != null)
-		{
-			short nodeType = node.getNodeType();
-			if (nodeType == Node.DOCUMENT_TYPE_NODE)
-			{
-				// handle doc type node
-				IDOMNode docNode = (IDOMNode) node;
-				hyperRegion = new Region(docNode.getStartOffset(), docNode.getEndOffset() - docNode.getStartOffset());
-			}
-			else if (nodeType == Node.ATTRIBUTE_NODE)
-			{
-				// handle attribute nodes
-				IDOMAttr att = (IDOMAttr) node;
-				// do not include quotes in attribute value region
-				int regOffset = att.getValueRegionStartOffset();
-				ITextRegion valueRegion = att.getValueRegion();
-				if (valueRegion != null)
-				{
-					int regLength = valueRegion.getTextLength();
-					String attValue = att.getValueRegionText();
-					if (StringUtils.isQuoted(attValue))
-					{
-						++regOffset;
-						regLength = regLength - 2;
-					}
-					hyperRegion = new Region(regOffset, regLength);
-				}
-			}
-		}
-		return hyperRegion;
-	}
-	
-	private IFile getFileForDocument(IDocument document)
-	{
-		IFile file = null;
-		IStructuredModel sModel = null;
-		try
-		{
-			sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (sModel != null)
-			{
-				IPath path = new Path(sModel.getBaseLocation());
-				file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			}
-		}
-		finally
-		{
-			if (sModel != null)
-				sModel.releaseFromRead();
-		}
-		return file != null && file.exists() ? file : null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/perspective/XMLPerspectiveFactory.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/perspective/XMLPerspectiveFactory.java
deleted file mode 100644
index 7652c33..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/perspective/XMLPerspectiveFactory.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005-2007 Standards for Technology in Automotive Retail
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - bug 213883 - initial api 
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.internal.perspective;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-import org.eclipse.ui.IFolderLayout;
-import org.eclipse.ui.console.IConsoleConstants;
-import org.eclipse.debug.ui.IDebugUIConstants;
-import org.eclipse.ui.navigator.resources.ProjectExplorer;
-
-
-/**
- * @author dcarver
- *
- */
-public class XMLPerspectiveFactory implements IPerspectiveFactory {
-
-    /**
-     * Creates the initial layout.  This is what the layout is reset to
-     * when the Reset Perspective is selected.   It takes as input a
-     * IPageLayout object.
-     *
-     * @param layout 
-     */
-	public void createInitialLayout(IPageLayout layout) {
-		// Get the Editor Area
-		String editorArea = layout.getEditorArea();
-
-		this.addShortCutViews(layout);
-		this.addShortCutPerspective(layout);
-
-		layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
-		layout.addActionSet("org.eclipse.wst.xsl.ui.xslActionSet"); //$NON-NLS-1$
-
-		// Turn on the Editor Area
-		layout.setEditorAreaVisible(true);
-		layout.setFixed(false);
-		
-		// Add the various views
-		IFolderLayout left =
-        layout.createFolder("left", IPageLayout.LEFT, (float) 0.26, editorArea); //$NON-NLS-1$
-		left.addView(ProjectExplorer.VIEW_ID);
-		
-		IFolderLayout right = layout.createFolder("right", IPageLayout.RIGHT, (float) 0.75, editorArea); //$NON-NLS-1$
-		right.addView(IPageLayout.ID_OUTLINE);
-		
-		// Add Outline to the bottom-left
-		IFolderLayout bottomLeft = 
-			layout.createFolder("bottom-left", IPageLayout.BOTTOM, (float) 0.50, "left"); //$NON-NLS-1$ //$NON-NLS-2$
-		bottomLeft.addView("org.eclipse.wst.xml.views.XPathView"); //$NON-NLS-1$
-		bottomLeft.addView("org.eclipse.wst.xml.xpath.ui.views.XPathNavigator"); //$NON-NLS-1$
-		
-		IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, (float) 0.75, editorArea); //$NON-NLS-1$
-		bottom.addView(IPageLayout.ID_PROBLEM_VIEW);
-		bottom.addView(IPageLayout.ID_PROP_SHEET);
-		bottom.addView(IConsoleConstants.ID_CONSOLE_VIEW);
-		bottom.addView("org.eclipse.wst.common.snippets.internal.ui.SnippetsView"); //$NON-NLS-1$
-		
-		//layout.addNewWizardShortcut("org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard"); //$NON-NLS-1$
-		layout.addNewWizardShortcut("org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard"); //$NON-NLS-1$
-		//layout.addNewWizardShortcut("org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard"); //$NON-NLS-1$
-		//layout.addNewWizardShortcut("org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard"); //$NON-NLS-1$
-		//layout.addNewWizardShortcut("org.eclipse.wst.wsdl.ui"); //$NON-NLS-1$
-		//layout.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder"); //$NON-NLS-1$
-		//layout.addNewWizardShortcut("additions");
-		
-		layout.addPerspectiveShortcut("org.eclipse.debug.ui.DebugPerspective"); //$NON-NLS-1$
-		
-	}
-	
-	/**
-	 * Adds View short cuts to the XML Perspective.  The short cuts added are:
-	 * XPath Navigator
-	 * ProjectExplorer
-	 * Navigator
-	 * Problems View
-	 * Console View 
-	 * @param layout
-	 */
-	private void addShortCutViews(IPageLayout layout) {
-		layout.addShowViewShortcut("org.eclipse.wst.xml.views.XPathView"); //$NON-NLS-1$
-        layout.addShowViewShortcut("org.eclipse.wst.xml.xpath.ui.views.XPathNavigator"); //$NON-NLS-1$
-		layout.addShowViewShortcut(ProjectExplorer.VIEW_ID);
-		layout.addShowViewShortcut(IPageLayout.ID_RES_NAV);
-        layout.addShowViewShortcut(IPageLayout.ID_OUTLINE);
-        layout.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW);
-        layout.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW);
-        layout.addShowViewShortcut("org.eclipse.wst.common.snippets.internal.ui.SnippetsView"); //$NON-NLS-1$
-	}
-	
-	private void addShortCutPerspective(IPageLayout layout) {
-		
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/IEditorConstants.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/IEditorConstants.java
deleted file mode 100644
index 0cd83dd..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/IEditorConstants.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-/**
- * 
- * Philosophical note.
- * 
- * Expression Editors present in the BPEL designer imply "expressions". Expressions tend 
- * to return things, so there should always be a type to an expression. In some cases
- * there are statically implied types (boolean, unsignedInt).
- * 
- * @author IBM Original Contribution
- * @author Michal Chmielewski (michal.chmielewski@oracle.com)
- * @date Jul 17, 2007
- *
- * 
- */
-
-@SuppressWarnings("nls") //$NON-NLS-1$
-public interface IEditorConstants {
-	
-	/** General Boolean Expression Type */
-	public static final String ET_BOOLEAN = "boolean"; //$NON-NLS-1$
-	
-	/** General datetime expression type (deadline) used in Wait, OnAlarm */	
-	public static final String ET_DATETIME = "deadline"; //$NON-NLS-1$
-	
-	/** General duration expression type (time) used in Wait, OnAlarm */	
-	public static final String ET_DURATION = "duration"; //$NON-NLS-1$
-	
-	/** Unsigned integer expression type, used in forEach loop */	
-	public static final String ET_UNSIGNED_INT = "unsignedInt"; //$NON-NLS-1$
-		
-	/** Any expression type */
-	public static final String ET_ANY = "any";  //$NON-NLS-1$
-	
-	/** A Boolean expression within a jointCondition */
-	public static final String ET_JOIN = "joinCondition/boolean" ; //$NON-NLS-1$
-
-	/** A Boolean expression within a transitionCondition */
-	public static final String ET_TRANSITION = "transitionCondition/boolean" ; //$NON-NLS-1$
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/MainPreferencePage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/MainPreferencePage.java
deleted file mode 100644
index e027d16..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/MainPreferencePage.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *     David Carver - STAR - bug 213853 - Moved main preference page out of
- *                                        debug ui and into XSL ui.
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-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.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * 
- *
- */
-public class MainPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-	/**
-	 * MainPreferncePage is the constructor for the XSL Preference Page
-	 */
-	public MainPreferencePage()
-	{
-		super();
-		noDefaultAndApplyButton();
-	}
-
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench)
-	{
-	}
-
-	@Override
-	protected Control createContents(Composite ancestor)
-	{
-		initializeDialogUnits(ancestor);
-
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		ancestor.setLayout(layout);
-
-		Label label = new Label(ancestor, SWT.NONE);
-		label.setText(Messages.getString("MainPreferencePage.0")); //$NON-NLS-1$
-
-		// Label label = new Label(ancestor,SWT.NONE);
-		// label.setText("Resolve URI's relative to:");
-		//		
-		// Button radio1 = new Button(ancestor,SWT.RADIO);
-		// radio1.setText("working directory");
-		//		
-		// Button radio2 = new Button(ancestor,SWT.RADIO);
-		// radio2.setText("stylesheet");
-		//		
-		// Button radio3 = new Button(ancestor,SWT.RADIO);
-		// radio3.setText("input file");
-		//
-		// Button radio4 = new Button(ancestor,SWT.RADIO);
-		// radio4.setText("specific location");
-		//
-		// label = new Label(ancestor,SWT.NONE);
-		// label.setText("Default output directory:");
-		//		
-		// radio1 = new Button(ancestor,SWT.RADIO);
-		// radio1.setText("temp user.dir");
-		//		
-		// radio2 = new Button(ancestor,SWT.RADIO);
-		// radio2.setText("same as working directory");
-		//		
-		// radio3 = new Button(ancestor,SWT.RADIO);
-		// radio3.setText("specific location");
-
-		// TODO PlatformUI.getWorkbench().getHelpSystem().setHelp...
-
-		applyDialogFont(ancestor);
-		return ancestor;
-	}
-
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performOk()
-	 */
-	@Override
-	public boolean performOk()
-	{
-		return super.performOk();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/Messages.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/Messages.java
deleted file mode 100644
index a1a62e2..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * TODO: Add Javadoc
- * @author dcarver
- *
- */
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.ui.internal.preferences.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	/**
-	 * TODO: Add Javadoc
-	 * @param key
-	 * @return
-	 */
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/ValidationPreferencePage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/ValidationPreferencePage.java
deleted file mode 100644
index 9454746..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/ValidationPreferencePage.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.xsl.core.internal.ValidationPreferences;
-import org.eclipse.wst.xsl.core.internal.XSLCorePlugin;
-
-public class ValidationPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-	private Text maxErrorsText;
-
-	public ValidationPreferencePage()
-	{
-		super();
-		// only used when page is shown programatically
-		setTitle("XSL Validation");
-		setDescription("Configure validation preferences");
-	}
-
-	@Override
-	protected Control createContents(Composite parent)
-	{
-		parent = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		parent.setLayout(layout);
-
-		Label label = new Label(parent, SWT.NULL);
-		GridData gd = new GridData(SWT.NONE, SWT.CENTER, false, false);
-		label.setText("Maximum number of errors reported per stylesheet:"); //$NON-NLS-1$
-		label.setLayoutData(gd);
-
-		maxErrorsText = new Text(parent, SWT.BORDER);
-		gd = new GridData(SWT.FILL, SWT.CENTER, true, false);
-		maxErrorsText.setLayoutData(gd);
-
-		setInput();
-
-		return parent;
-	}
-
-	private void setInput()
-	{
-		int missingParamPref = getInt(ValidationPreferences.MAX_ERRORS);
-		maxErrorsText.setText(String.valueOf(missingParamPref));
-	}
-	
-	public void init(IWorkbench workbench)
-	{
-	}
-	
-	@Override
-	protected void performDefaults()
-	{
-		super.performDefaults();
-	}
-	
-	private int getInt(String pref)
-	{
-		return XSLCorePlugin.getDefault().getPluginPreferences().getInt(pref);
-	}
-
-	private void setValue(String pref, int val)
-	{
-		XSLCorePlugin.getDefault().getPluginPreferences().setValue(pref, val);
-	}
-
-	@Override
-	public boolean performOk()
-	{
-		String maxErrorsString = maxErrorsText.getText();
-		int maxErrors;
-		try
-		{
-			maxErrors = Integer.parseInt(maxErrorsString);
-		}
-		catch (NumberFormatException e)
-		{
-			maxErrors = getInt(ValidationPreferences.MAX_ERRORS);
-		}
-		setValue(ValidationPreferences.MAX_ERRORS, maxErrors);
-		
-		XSLCorePlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XPathTemplatePreferencePage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XPathTemplatePreferencePage.java
deleted file mode 100644
index 6cd0354..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XPathTemplatePreferencePage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-import org.eclipse.wst.xml.ui.internal.preferences.XMLTemplatePreferencePage;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-/**
- * XSLTemplatePreferencePage sets up the template preference page that
- * contains the templates for xpath, xpath 2.0, axis, operators, and 
- * exslt functions. 
- * 
- * @author dcarver
- *
- */
-public class XPathTemplatePreferencePage extends XMLTemplatePreferencePage {
-
-	/**
-	 * 
-	 */
-	public XPathTemplatePreferencePage() {
-		setPreferenceStore(XSLUIPlugin.getDefault().getPreferenceStore());
-		setTemplateStore(XSLUIPlugin.getDefault().getXPathTemplateStore());
-		setContextTypeRegistry(XSLUIPlugin.getDefault().getXPathTemplateContextRegistry());
-	}
-	
-	/**
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	@Override
-	public boolean performOk() {
-		boolean ok = super.performOk();
-		XSLUIPlugin.getDefault().savePluginPreferences();
-		return ok;
-	}	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLTemplatePreferencePage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLTemplatePreferencePage.java
deleted file mode 100644
index 2b09d62..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLTemplatePreferencePage.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-import org.eclipse.wst.xml.ui.internal.preferences.XMLTemplatePreferencePage;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-/**
- * XSLTemplatePreferencePage sets up the template preference page that
- * contains the templates for xpath, xpath 2.0, axis, operators, and 
- * exslt functions. 
- * 
- * @author dcarver
- *
- */
-public class XSLTemplatePreferencePage extends XMLTemplatePreferencePage {
-
-	/**
-	 * 
-	 */
-	public XSLTemplatePreferencePage() {
-		setPreferenceStore(XSLUIPlugin.getDefault().getPreferenceStore());
-		setTemplateStore(XSLUIPlugin.getDefault().getTemplateStore());
-		setContextTypeRegistry(XSLUIPlugin.getDefault().getTemplateContextRegistry());
-	}
-	
-	/**
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	@Override
-	public boolean performOk() {
-		boolean ok = super.performOk();
-		XSLUIPlugin.getDefault().savePluginPreferences();
-		return ok;
-	}	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/messages.properties b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/messages.properties
deleted file mode 100644
index 4e048e8..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-MainPreferencePage.0=Expand the tree to set preferences 
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/LineStyleProviderForXSL.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/LineStyleProviderForXSL.java
deleted file mode 100755
index fa0ff90..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/LineStyleProviderForXSL.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     Benjamin Muskalla, b.muskalla@gmx.net - [158660] character entities should have their own syntax highlighting preference     
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.style;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.internal.provisional.style.AbstractLineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
-import org.eclipse.wst.xml.ui.internal.style.LineStyleProviderForXML;
-
-public class LineStyleProviderForXSL extends LineStyleProviderForXML implements LineStyleProvider {
-	public LineStyleProviderForXSL() {
-		super();
-	}
-
-
-	protected IPreferenceStore getColorPreferences() {
-		return XMLUIPlugin.getDefault().getPreferenceStore();
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/TemplateContextTypeIdsXPath.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/TemplateContextTypeIdsXPath.java
deleted file mode 100755
index e21f94f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/TemplateContextTypeIdsXPath.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.internal.templates;
-
-/**
- * This class contains the names and values for the XSL ContenxtTypes for
- * the XPath completion proposals.
- * 
- * @author dcarver
- *
- */
-public class TemplateContextTypeIdsXPath {
-
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String XPATH = getXPath();
-	
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String XPATH2 = getXPath2();
-
-
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String AXIS = getAXIS();
-	
-	
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String EXSLT = getEXSLT();
-	
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String OPERATOR = getOperator();
-	
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public static final String CUSTOM = getCustom();
-
-
-	private static String getXPath() {
-		return "xsl_xpath"; //$NON-NLS-1$
-	}
-
-	private static String getXPath2() {
-		return "xpath_2"; //$NON-NLS-1$
-	}
-	
-	private static String getAXIS() {
-		return "xpath_axis"; //$NON-NLS-1$
-	}
-	
-	private static String getEXSLT() {
-		return "exslt_functions"; //$NON-NLS-1$
-	}
-	
-	private static String getOperator() {
-		return "xpath_operator"; //$NON-NLS-1$
-	}
-
-	private static String getCustom() {
-		return "extension_function"; //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/TemplateContextTypeXSL.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/TemplateContextTypeXSL.java
deleted file mode 100644
index 0b1d83f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/TemplateContextTypeXSL.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.templates;
-
-import org.eclipse.jface.text.templates.GlobalTemplateVariables;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.wst.xml.ui.internal.templates.EncodingTemplateVariableResolverXML;
-
-public class TemplateContextTypeXSL extends TemplateContextType
-{
-	public TemplateContextTypeXSL()
-	{
-		super();
-		addResolver(new GlobalTemplateVariables.Cursor());
-		addResolver(new GlobalTemplateVariables.Date());
-		addResolver(new GlobalTemplateVariables.Dollar());
-		addResolver(new GlobalTemplateVariables.LineSelection());
-		addResolver(new GlobalTemplateVariables.Time());
-		addResolver(new GlobalTemplateVariables.User());
-		addResolver(new GlobalTemplateVariables.WordSelection());
-		addResolver(new GlobalTemplateVariables.Year());
-		addResolver(new EncodingTemplateVariableResolverXML());
-		addResolver(new VersionTemplateVariableResolverXSL());
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/VersionTemplateVariableResolverXSL.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/VersionTemplateVariableResolverXSL.java
deleted file mode 100644
index 931ff0b..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/VersionTemplateVariableResolverXSL.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.templates;
-
-import org.eclipse.jface.text.templates.SimpleTemplateVariableResolver;
-import org.eclipse.jface.text.templates.TemplateContext;
-
-public class VersionTemplateVariableResolverXSL extends SimpleTemplateVariableResolver
-{
-	private static final String VERSION_TYPE = getVersionType();
-
-	private static String getVersionType()
-	{
-		return "xsl_version"; //$NON-NLS-1$
-	}
-
-	public VersionTemplateVariableResolverXSL()
-	{
-		super(VERSION_TYPE, "XSLT Version preference");
-	}
-
-	protected String resolve(TemplateContext context)
-	{
-		// TODO
-		return "1.0";
-		// return
-		// XMLCorePlugin.getDefault().getPluginPreferences().getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/util/XSLPluginImageHelper.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/util/XSLPluginImageHelper.java
deleted file mode 100755
index ca9352f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/util/XSLPluginImageHelper.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.util;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-
-/**
- * Helper class to handle images provided by this plug-in.
- * 
- * NOTE: For internal use only. For images used externally, please use the
- * Shared***ImageHelper class instead.
- * 
- * @author david carver based on work by amywu
- */
-public class XSLPluginImageHelper {
-	private static XSLPluginImageHelper instance = null;
-
-	/**
-	 * Gets the instance.
-	 * 
-	 * @return Returns a XMLEditorPluginImageHelper
-	 */
-	public synchronized static XSLPluginImageHelper getInstance() {
-		if (instance == null) {
-			instance = new XSLPluginImageHelper();
-		}
-		return instance;
-	}
-
-	// save a descriptor for each image
-	@SuppressWarnings("unchecked")
-	private HashMap fImageDescRegistry = null;
-	private final String PLUGINID = XSLUIPlugin.PLUGIN_ID;
-
-	/**
-	 * Creates an image from the given resource and adds the image to the
-	 * image registry.
-	 * 
-	 * @param resource
-	 * @return Image
-	 */
-	private Image createImage(String resource) {
-		ImageDescriptor desc = getImageDescriptor(resource);
-		Image image = null;
-
-		if (desc != null) {
-			image = desc.createImage();
-			// dont add the missing image descriptor image to the image
-			// registry
-			if (!desc.equals(ImageDescriptor.getMissingImageDescriptor())) {
-				getImageRegistry().put(resource, image);
-			}
-		}
-		return image;
-	}
-
-	/**
-	 * Creates an image descriptor from the given imageFilePath and adds the
-	 * image descriptor to the image descriptor registry. If an image
-	 * descriptor could not be created, the default "missing" image descriptor
-	 * is returned but not added to the image descriptor registry.
-	 * 
-	 * @param imageFilePath
-	 * @return ImageDescriptor image descriptor for imageFilePath or default
-	 *         "missing" image descriptor if resource could not be found
-	 */
-	@SuppressWarnings("unchecked")
-	private ImageDescriptor createImageDescriptor(String imageFilePath) {
-		ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGINID, imageFilePath);
-		if (imageDescriptor != null) {
-			getImageDescriptorRegistry().put(imageFilePath, imageDescriptor);
-		}
-		else {
-			imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
-		}
-
-		return imageDescriptor;
-	}
-
-	/**
-	 * Retrieves the image associated with resource from the image registry.
-	 * If the image cannot be retrieved, attempt to find and load the image at
-	 * the location specified in resource.
-	 * 
-	 * @param resource
-	 *            the image to retrieve
-	 * @return Image the image associated with resource or null if one could
-	 *         not be found
-	 */
-	public Image getImage(String resource) {
-		Image image = getImageRegistry().get(resource);
-		if (image == null) {
-			// create an image
-			image = createImage(resource);
-		}
-		return image;
-	}
-
-	/**
-	 * Retrieves the image descriptor associated with resource from the image
-	 * descriptor registry. If the image descriptor cannot be retrieved,
-	 * attempt to find and load the image descriptor at the location specified
-	 * in resource.
-	 * 
-	 * @param resource
-	 *            the image descriptor to retrieve
-	 * @return ImageDescriptor the image descriptor assocated with resource or
-	 *         the default "missing" image descriptor if one could not be
-	 *         found
-	 */
-	public ImageDescriptor getImageDescriptor(String resource) {
-		ImageDescriptor imageDescriptor = null;
-		Object o = getImageDescriptorRegistry().get(resource);
-		if (o == null) {
-			// create a descriptor
-			imageDescriptor = createImageDescriptor(resource);
-		}
-		else {
-			imageDescriptor = (ImageDescriptor) o;
-		}
-		return imageDescriptor;
-	}
-
-	/**
-	 * Returns the image descriptor registry for this plugin.
-	 * 
-	 * @return HashMap - image descriptor registry for this plugin
-	 */
-	@SuppressWarnings("unchecked")
-	private HashMap getImageDescriptorRegistry() {
-		if (fImageDescRegistry == null) {
-			fImageDescRegistry = new HashMap();
-		}
-		return fImageDescRegistry;
-	}
-
-	/**
-	 * Returns the image registry for this plugin.
-	 * 
-	 * @return ImageRegistry - image registry for this plugin
-	 */
-	private ImageRegistry getImageRegistry() {
-		return JFaceResources.getImageRegistry();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/util/XSLPluginImages.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/util/XSLPluginImages.java
deleted file mode 100755
index dfc21c6..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/util/XSLPluginImages.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - STAR - bug 213849 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.util;
-
-/**
- * Bundle of most images used by the XSL Plugins
- */
-public class XSLPluginImages {
-
-	/**
-	 * Path to the XPATH Images used for Content Assist
-	 */
-	public static final String IMG_XPATH_FUNCTION = "icons/full/function.gif"; //$NON-NLS-1$
-	
-	/**
-	 * Path to the XPATH Images used for Content Assist
-	 */
-	public static final String IMG_XPATH_AXIS = "icons/full/directional.gif"; //$NON-NLS-1$
-	
-	/**
-	 * Path to the XPATH Images used for Content Assist
-	 */
-	public static final String IMG_VARIABLES = "icons/full/variable.gif"; //$NON-NLS-1$	
-
-	/**
-	 * Path to the XPATH Images used for Content Assist
-	 */
-	public static final String IMG_OPERATOR = "icons/full/operation.gif"; //$NON-NLS-1$	
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXSL.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXSL.java
deleted file mode 100644
index aea4a8d..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXSL.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.validation;
-
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidator;
-
-/**
- * This performs the as-you-type validation for xsl files
- * 
- */
-public class DelegatingSourceValidatorForXSL extends DelegatingSourceValidator {
-	private final static String Id = "org.eclipse.wst.xsl.core.xsl"; //$NON-NLS-1$
-
-	private Validator _validator;
-
-	/**
-	 * Constructor
-	 */
-	public DelegatingSourceValidatorForXSL() {
-	}
-
-	private Validator getValidator() {
-		if (_validator == null)
-			_validator = ValidationFramework.getDefault().getValidator(Id);
-		return _validator;
-	}
-
-	protected IValidator getDelegateValidator() {
-		Validator v = getValidator();
-		if (v == null)
-			return null;
-		return v.asIValidator();
-	}
-	
-	@Override
-	public void validate(IValidationContext helper, IReporter reporter)
-			throws ValidationException {
-		// TODO Auto-generated method stub
-		super.validate(helper, reporter);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXalanXSL.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXalanXSL.java
deleted file mode 100644
index 3b87870..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXalanXSL.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.validation;
-
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidator;
-
-/**
- * This performs the as-you-type validation for xsl files
- * 
- */
-public class DelegatingSourceValidatorForXalanXSL extends DelegatingSourceValidator {
-	private final static String Id = "org.eclipse.wst.xsl.core.xsl.xalan"; //$NON-NLS-1$
-
-	private Validator _validator;
-
-	/**
-	 * Constructor
-	 */
-	public DelegatingSourceValidatorForXalanXSL() {
-	}
-
-	private Validator getValidator() {
-		if (_validator == null)
-			_validator = ValidationFramework.getDefault().getValidator(Id);
-		return _validator;
-	}
-
-	protected IValidator getDelegateValidator() {
-		Validator v = getValidator();
-		if (v == null)
-			return null;
-		return v.asIValidator();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/XSLErrorListener.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/XSLErrorListener.java
deleted file mode 100644
index 7a1456b..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/XSLErrorListener.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - STAR - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.internal.validation;
-
-import javax.xml.transform.*;
-import java.util.logging.*;
-
-/**
- * This class listens for Errors tossed by a XSL Processor.
- * 
- * @author dcarver
- * 
- */
-public class XSLErrorListener implements ErrorListener {
-
-	private Logger logger;
-
-	/**
-	 * TODO: Add Javadoc
-	 * @param logger
-	 */
-	public XSLErrorListener(Logger logger) {
-		this.logger = logger;
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * @see javax.xml.transform.ErrorListener#warning(javax.xml.transform.TransformerException)
-	 */
-	public void warning(TransformerException exception) {
-
-		logger.log(Level.WARNING, exception.getMessage(), exception);
-
-		// Don't throw an exception and stop the processor
-		// just for a warning; but do log the problem
-	}
-
-	/** 
-	 * (non-Javadoc)
-	 * @see javax.xml.transform.ErrorListener#error(javax.xml.transform.TransformerException)
-	 */
-	public void error(TransformerException exception)
-			throws TransformerException {
-
-		logger.log(Level.SEVERE, exception.getMessage(), exception);
-		// XSLT is not as draconian as XML. There are numerous errors
-		// which the processor may but does not have to recover from;
-		// e.g. multiple templates that match a node with the same
-		// priority. I do not want to allow that so I throw this
-		// exception here.
-		throw exception;
-
-	}
-
-	/**
-	 *  (non-Javadoc)
-	 * @see javax.xml.transform.ErrorListener#fatalError(javax.xml.transform.TransformerException)
-	 */
-	public void fatalError(TransformerException exception)
-			throws TransformerException {
-
-		logger.log(Level.SEVERE, exception.getMessage(), exception);
-
-		// This is an error which the processor cannot recover from;
-		// e.g. a malformed stylesheet or input document
-		// so I must throw this exception here.
-		throw exception;
-
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/XSLMarkupValidator.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/XSLMarkupValidator.java
deleted file mode 100644
index 69443f9..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/XSLMarkupValidator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - STAR - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.internal.validation;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.ui.internal.reconcile.validator.ISourceValidator;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.ui.internal.validation.MarkupValidator;
-
-/**
- * @author dcarver
- *
- */
-public class XSLMarkupValidator extends MarkupValidator implements IValidator, ISourceValidator {
-
-
-	/**
-	 *  (non-Javadoc)
-	 * @see org.eclipse.wst.validation.internal.provisional.core.IValidator#cleanup(org.eclipse.wst.validation.internal.provisional.core.IReporter)
-	 */
-	public void cleanup(IReporter reporter) {
-		// TODO Auto-generated method stub
-		super.cleanup(reporter);
-
-	}
-
-	/**
-	 * 
-	 * @param helper 
-	 * @param reporter 
-	 * @throws ValidationException 
-	 * 
-	 */
-	public void validate(IValidationContext helper, IReporter reporter)
-			throws ValidationException {
-		// TODO Auto-generated method stub
-		super.validate(helper, reporter);
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.xml.ui.internal.validation.MarkupValidator#connect(org.eclipse.jface.text.IDocument)
-	 */
-	public void connect(IDocument document) {
-        super.connect(document);
-	}
-
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.xml.ui.internal.validation.MarkupValidator#disconnect(org.eclipse.jface.text.IDocument)
-	 */
-	public void disconnect(IDocument document) {
-		super.disconnect(document);
-	}
-
-	/**
-	 *  (non-Javadoc)
-	 * @see org.eclipse.wst.xml.ui.internal.validation.MarkupValidator#validate(org.eclipse.jface.text.IRegion, org.eclipse.wst.validation.internal.provisional.core.IValidationContext, org.eclipse.wst.validation.internal.provisional.core.IReporter)
-	 */
-	public void validate(IRegion dirtyRegion, IValidationContext helper,
-			IReporter reporter) {
-		super.validate(dirtyRegion, helper, reporter);
-	}
-	
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.xml.ui.internal.validation.MarkupValidator#validate(org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion, org.eclipse.wst.validation.internal.provisional.core.IReporter)
-	 */
-	@Override
-	public void validate(IStructuredDocumentRegion structuredDocumentRegion,
-			IReporter reporter) {
-		// TODO Auto-generated method stub
-		super.validate(structuredDocumentRegion, reporter);
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileTemplatesWizardPage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileTemplatesWizardPage.java
deleted file mode 100644
index b2ee79e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileTemplatesWizardPage.java
+++ /dev/null
@@ -1,430 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.wizards;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.text.templates.DocumentTemplateContext;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateBuffer;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-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.StructuredSelection;
-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.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.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.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.wst.xsl.ui.internal.XSLUIConstants;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-public class NewXSLFileTemplatesWizardPage extends WizardPage
-{
-	private String fLastSelectedTemplateName;
-	private SourceViewer fPatternViewer;
-	private TableViewer fTableViewer;
-	private TemplateStore fTemplateStore;
-	private Button fUseTemplateButton;
-
-	public NewXSLFileTemplatesWizardPage()
-	{
-		super("NewStylesheetTemplatesWizardPage", "Select XSL Template", null); //$NON-NLS-1$
-		setDescription("Select a template as initial content for the stylesheet");
-	}
-
-	private void configureTableResizing(final Composite parent, final Table table, final TableColumn column1, final TableColumn column2)
-	{
-		parent.addControlListener(new ControlAdapter()
-		{
-			public void controlResized(ControlEvent e)
-			{
-				Rectangle area = parent.getClientArea();
-				Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-				int width = area.width - 2 * table.getBorderWidth();
-				if (preferredSize.y > area.height)
-				{
-					// Subtract the scrollbar width from the total column
-					// width
-					// if a vertical scrollbar will be required
-					Point vBarSize = table.getVerticalBar().getSize();
-					width -= vBarSize.x;
-				}
-
-				Point oldSize = table.getSize();
-				if (oldSize.x > width)
-				{
-					// table is getting smaller so make the columns
-					// smaller first and then resize the table to
-					// match the client area width
-					column1.setWidth(width / 2);
-					column2.setWidth(width / 2);
-					table.setSize(width, area.height);
-				}
-				else
-				{
-					// table is getting bigger so make the table
-					// bigger first and then make the columns wider
-					// to match the client area width
-					table.setSize(width, area.height);
-					column1.setWidth(width / 2);
-					column2.setWidth(width / 2);
-				}
-			}
-		});
-	}
-
-	public void createControl(Composite ancestor)
-	{
-		Composite parent = new Composite(ancestor, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		parent.setLayout(layout);
-
-		// create checkbox for user to use JSP Template
-		fUseTemplateButton = new Button(parent, SWT.CHECK);
-		fUseTemplateButton.setText("Use template");
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
-		fUseTemplateButton.setLayoutData(data);
-		fUseTemplateButton.addSelectionListener(new SelectionAdapter()
-		{
-			public void widgetSelected(SelectionEvent e)
-			{
-				enableTemplates();
-			}
-		});
-
-		// create composite for Templates table
-		Composite innerParent = new Composite(parent, SWT.NONE);
-		GridLayout innerLayout = new GridLayout();
-		innerLayout.numColumns = 2;
-		innerLayout.marginHeight = 0;
-		innerLayout.marginWidth = 0;
-		innerParent.setLayout(innerLayout);
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
-		innerParent.setLayoutData(gd);
-
-		// Create linked text to just to templates preference page
-		Link link = new Link(innerParent, SWT.NONE);
-		link.setText("Templates are 'New Stylesheet' templates found in the <a>XSL</a> preference page");
-		data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
-		link.setLayoutData(data);
-		link.addSelectionListener(new SelectionAdapter()
-		{
-			public void widgetSelected(SelectionEvent e)
-			{
-				linkClicked();
-			}
-		});
-
-		// create table that displays templates
-		Table table = new Table(innerParent, SWT.BORDER | SWT.FULL_SELECTION);
-
-		data = new GridData(GridData.FILL_BOTH);
-		data.widthHint = convertWidthInCharsToPixels(2);
-		data.heightHint = convertHeightInCharsToPixels(10);
-		data.horizontalSpan = 2;
-		table.setLayoutData(data);
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-		TableLayout tableLayout = new TableLayout();
-		table.setLayout(tableLayout);
-
-		TableColumn column1 = new TableColumn(table, SWT.NONE);
-		column1.setText("Name");
-
-		TableColumn column2 = new TableColumn(table, SWT.NONE);
-		column2.setText("Description");
-
-		fTableViewer = new TableViewer(table);
-		fTableViewer.setLabelProvider(new TemplateLabelProvider());
-		fTableViewer.setContentProvider(new TemplateContentProvider());
-
-		fTableViewer.setSorter(new ViewerSorter()
-		{
-			public int compare(Viewer viewer, Object object1, Object object2)
-			{
-				if ((object1 instanceof Template) && (object2 instanceof Template))
-				{
-					Template left = (Template) object1;
-					Template right = (Template) object2;
-					int result = left.getName().compareToIgnoreCase(right.getName());
-					if (result != 0)
-						return result;
-					return left.getDescription().compareToIgnoreCase(right.getDescription());
-				}
-				return super.compare(viewer, object1, object2);
-			}
-
-			public boolean isSorterProperty(Object element, String property)
-			{
-				return true;
-			}
-		});
-
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-			public void selectionChanged(SelectionChangedEvent e)
-			{
-				updateViewerInput();
-			}
-		});
-
-		// create viewer that displays currently selected template's contents
-		fPatternViewer = doCreateViewer(parent);
-
-		fTemplateStore = XSLUIPlugin.getDefault().getTemplateStore();
-		fTableViewer.setInput(fTemplateStore);
-
-		configureTableResizing(innerParent, table, column1, column2);
-		loadLastSavedPreferences();
-
-		// PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.JSP_NEWWIZARD_TEMPLATE_HELPID);
-		Dialog.applyDialogFont(parent);
-		setControl(parent);
-	}
-
-	private SourceViewer createViewer(Composite parent)
-	{
-		SourceViewer viewer = new SourceViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		SourceViewerConfiguration configuration = new SourceViewerConfiguration();
-		viewer.configure(configuration);
-		IDocument document = new Document();
-		viewer.setDocument(document);
-		return viewer;
-	}
-
-	private SourceViewer doCreateViewer(Composite parent)
-	{
-		Label label = new Label(parent, SWT.NONE);
-		label.setText("Preview");
-		GridData data = new GridData();
-		data.horizontalSpan = 2;
-		label.setLayoutData(data);
-
-		SourceViewer viewer = createViewer(parent);
-		viewer.setEditable(false);
-
-		Control control = viewer.getControl();
-		data = new GridData(GridData.FILL_BOTH);
-		data.horizontalSpan = 2;
-		data.heightHint = convertHeightInCharsToPixels(5);
-		control.setLayoutData(data);
-
-		return viewer;
-	}
-
-	void enableTemplates()
-	{
-		boolean enabled = fUseTemplateButton.getSelection();
-
-		if (enabled)
-		{
-			setSelectedTemplate(fLastSelectedTemplateName);
-		}
-		else
-		{
-			// save last selected template
-			Template template = getSelectedTemplate();
-			if (template != null)
-				fLastSelectedTemplateName = template.getName();
-			else
-				fLastSelectedTemplateName = ""; //$NON-NLS-1$
-
-			fTableViewer.setSelection(null);
-		}
-
-		fTableViewer.getControl().setEnabled(enabled);
-		fPatternViewer.getControl().setEnabled(enabled);
-	}
-
-	private Template getSelectedTemplate()
-	{
-		Template template = null;
-		IStructuredSelection selection = (IStructuredSelection) fTableViewer.getSelection();
-
-		if (selection.size() == 1)
-		{
-			template = (Template) selection.getFirstElement();
-		}
-		return template;
-	}
-
-	String getTemplateString()
-	{
-		String templateString = null;
-
-		Template template = getSelectedTemplate();
-		if (template != null)
-		{
-			TemplateContextType contextType = XSLUIPlugin.getDefault().getTemplateContextRegistry().getContextType(XSLUIConstants.TEMPLATE_CONTEXT_XSL_NEW);
-			IDocument document = new Document();
-			TemplateContext context = new DocumentTemplateContext(contextType, document, 0, 0);
-			try
-			{
-				TemplateBuffer buffer = context.evaluate(template);
-				templateString = buffer.getString();
-			}
-			catch (Exception e)
-			{
-				XSLUIPlugin.log(e);
-			}
-		}
-
-		return templateString;
-	}
-
-	void linkClicked()
-	{
-		String pageId = "org.eclipse.wst.xsl.ui.template.preferencePage";
-		PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(getShell(), pageId, new String[] { pageId }, null);
-		dialog.open();
-		fTableViewer.refresh();
-	}
-
-	private void loadLastSavedPreferences()
-	{
-//		String templateName = XSLUIPlugin.getDefault().getPreferenceStore().getString("JSPUIPreferenceNames.NEW_FILE_TEMPLATE_NAME");
-//		if (templateName == null || templateName.length() == 0)
-//		{
-//			fLastSelectedTemplateName = ""; //$NON-NLS-1$
-//			fUseTemplateButton.setSelection(false);
-//		}
-//		else
-//		{
-//			fLastSelectedTemplateName = templateName;
-//			fUseTemplateButton.setSelection(true);
-//		}
-//		enableTemplates();
-	}
-
-	void saveLastSavedPreferences()
-	{
-//		String templateName = ""; //$NON-NLS-1$
-//
-//		Template template = getSelectedTemplate();
-//		if (template != null)
-//		{
-//			templateName = template.getName();
-//		}
-//
-//		XSLUIPlugin.getDefault().getPreferenceStore().setValue(JSPUIPreferenceNames.NEW_FILE_TEMPLATE_NAME, templateName);
-//		XSLUIPlugin.getDefault().savePluginPreferences();
-	}
-
-	private void setSelectedTemplate(String templateName)
-	{
-		Object template = null;
-
-		if (templateName != null && templateName.length() > 0)
-		{
-			// pick the last used template
-			template = fTemplateStore.findTemplate(templateName, XSLUIConstants.TEMPLATE_CONTEXT_XSL_NEW);
-		}
-
-		// no record of last used template so just pick first element
-		if (template == null)
-		{
-			// just pick first element
-			template = fTableViewer.getElementAt(0);
-		}
-
-		if (template != null)
-		{
-			IStructuredSelection selection = new StructuredSelection(template);
-			fTableViewer.setSelection(selection, true);
-		}
-	}
-
-	void updateViewerInput()
-	{
-		Template template = getSelectedTemplate();
-		if (template != null)
-		{
-			fPatternViewer.getDocument().set(template.getPattern());
-		}
-		else
-		{
-			fPatternViewer.getDocument().set(""); //$NON-NLS-1$
-		}
-	}
-	
-	private class TemplateContentProvider implements IStructuredContentProvider
-	{
-		private TemplateStore fStore;
-
-		public void dispose()
-		{
-			fStore = null;
-		}
-
-		public Object[] getElements(Object input)
-		{
-			return fStore.getTemplates(XSLUIConstants.TEMPLATE_CONTEXT_XSL_NEW);
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-		{
-			fStore = (TemplateStore) newInput;
-		}
-	}
-
-	private class TemplateLabelProvider extends LabelProvider implements ITableLabelProvider
-	{
-		public Image getColumnImage(Object element, int columnIndex)
-		{
-			return null;
-		}
-
-		public String getColumnText(Object element, int columnIndex)
-		{
-			Template template = (Template) element;
-
-			switch (columnIndex)
-			{
-			case 0:
-				return template.getName();
-			case 1:
-				return template.getDescription();
-			default:
-				return "";
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileWizard.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileWizard.java
deleted file mode 100644
index 3cb53af..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileWizard.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.wizards;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStreamWriter;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-public class NewXSLFileWizard extends Wizard implements INewWizard
-{
-	private NewXSLFileWizardPage fNewFilePage;
-	private NewXSLFileTemplatesWizardPage fNewFileTemplatesPage;
-	private IStructuredSelection fSelection;
-
-	public void addPages()
-	{
-		fNewFilePage = new NewXSLFileWizardPage("NewFileCreationPage", new StructuredSelection(IDE.computeSelectedResources(fSelection))); //$NON-NLS-1$ 
-		fNewFilePage.setTitle("XSL Stylesheet");
-		fNewFilePage.setDescription("Create a new XSL Stylesheet.");
-		addPage(fNewFilePage);
-
-		fNewFileTemplatesPage = new NewXSLFileTemplatesWizardPage();
-		addPage(fNewFileTemplatesPage);
-	}
-
-	public void init(IWorkbench aWorkbench, IStructuredSelection aSelection)
-	{
-		fSelection = aSelection;
-		setWindowTitle("New XSL Stylesheet");
-
-		// TODO image for wizard
-		// ImageDescriptor descriptor =
-		// JSPEditorPluginImageHelper.getInstance().getImageDescriptor(JSPEditorPluginImages.IMG_OBJ_WIZBAN_NEWJSPFILE);
-		// setDefaultPageImageDescriptor(descriptor);
-	}
-
-	public boolean performFinish()
-	{
-		boolean performedOK = false;
-
-		// save user options for next use
-		fNewFileTemplatesPage.saveLastSavedPreferences();
-
-		// no file extension specified so add default extension
-		String fileName = fNewFilePage.getFileName();
-		if (fileName.lastIndexOf('.') == -1)
-		{
-			String newFileName = fNewFilePage.addDefaultExtension(fileName);
-			fNewFilePage.setFileName(newFileName);
-		}
-
-		// create a new empty file
-		IFile file = fNewFilePage.createNewFile();
-
-		// if there was problem with creating file, it will be null, so make
-		// sure to check
-		if (file != null)
-		{
-			// put template contents into file
-			String templateString = fNewFileTemplatesPage.getTemplateString();
-			if (templateString != null)
-			{
-				// determine the encoding for the new file
-				Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-				String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-
-				try
-				{
-					ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-					OutputStreamWriter outputStreamWriter = null;
-					if (charSet == null || charSet.trim().equals("")) { //$NON-NLS-1$
-						// just use default encoding
-						outputStreamWriter = new OutputStreamWriter(outputStream);
-					}
-					else
-					{
-						outputStreamWriter = new OutputStreamWriter(outputStream, charSet);
-					}
-					outputStreamWriter.write(templateString);
-					outputStreamWriter.flush();
-					outputStreamWriter.close();
-					ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
-					file.setContents(inputStream, true, false, null);
-					inputStream.close();
-				}
-				catch (Exception e)
-				{
-					XSLUIPlugin.log(e);
-				}
-			}
-
-			// open the file in editor
-			openEditor(file);
-
-			// everything's fine
-			performedOK = true;
-		}
-		return performedOK;
-	}
-
-	private void openEditor(final IFile file)
-	{
-		if (file != null)
-		{
-			getShell().getDisplay().asyncExec(new Runnable()
-			{
-				public void run()
-				{
-					try
-					{
-						IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-						IDE.openEditor(page, file, true);
-					}
-					catch (PartInitException e)
-					{
-						XSLUIPlugin.log(e);
-					}
-				}
-			});
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileWizardPage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileWizardPage.java
deleted file mode 100644
index 7b8b33b..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileWizardPage.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.wst.xsl.core.XSLCore;
-
-class NewXSLFileWizardPage extends WizardNewFileCreationPage
-{
-	private IContentType fContentType;
-	private List fValidExtensions = null;
-
-	public NewXSLFileWizardPage(String pageName, IStructuredSelection selection)
-	{
-		super(pageName, selection);
-		setFileName("NewFile.xsl");
-	}
-
-	protected boolean validatePage()
-	{
-		setMessage(null);
-		setErrorMessage(null);
-
-		if (!super.validatePage())
-		{
-			return false;
-		}
-
-		String fileName = getFileName();
-		IPath fullPath = getContainerFullPath();
-		if ((fullPath != null) && (fullPath.isEmpty() == false) && (fileName != null))
-		{
-			// check that filename does not contain invalid extension
-			if (!extensionValidForContentType(fileName))
-			{
-				setErrorMessage(NLS.bind("The file name must end in one of the following extensions {0}.", getValidExtensions().toString()));
-				return false;
-			}
-			// no file extension specified so check adding default
-			// extension doesn't equal a file that already exists
-			if (fileName.lastIndexOf('.') == -1)
-			{
-				String newFileName = addDefaultExtension(fileName);
-				IPath resourcePath = fullPath.append(newFileName);
-
-				IWorkspace workspace = ResourcesPlugin.getWorkspace();
-				IStatus result = workspace.validatePath(resourcePath.toString(), IResource.FOLDER);
-				if (!result.isOK())
-				{
-					// path invalid
-					setErrorMessage(result.getMessage());
-					return false;
-				}
-
-				if ((workspace.getRoot().getFolder(resourcePath).exists() || workspace.getRoot().getFile(resourcePath).exists()))
-				{
-					setErrorMessage("The same name already exists.");
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	String addDefaultExtension(String filename)
-	{
-		StringBuffer newFileName = new StringBuffer(filename);
-
-		// Preferences preference =
-		// XSLUIPlugin.getDefault().getPluginPreferences();
-		// String ext =
-		// preference.getString(JSPCorePreferenceNames.DEFAULT_EXTENSION);
-
-		String ext = "xsl";
-		newFileName.append(".");
-		newFileName.append(ext);
-
-		return newFileName.toString();
-	}
-
-	/**
-	 * Get content type associated with this new file wizard
-	 * 
-	 * @return IContentType
-	 */
-	private IContentType getContentType()
-	{
-		if (fContentType == null)
-			fContentType = Platform.getContentTypeManager().getContentType(XSLCore.XSL_CONTENT_TYPE);
-		return fContentType;
-	}
-
-	private List getValidExtensions()
-	{
-		if (fValidExtensions == null)
-		{
-			IContentType type = getContentType();
-			fValidExtensions = new ArrayList(Arrays.asList(type.getFileSpecs(IContentType.FILE_EXTENSION_SPEC)));
-		}
-		return fValidExtensions;
-	}
-
-	private boolean extensionValidForContentType(String fileName)
-	{
-		boolean valid = false;
-
-		IContentType type = getContentType();
-		// there is currently an extension
-		if (fileName.lastIndexOf('.') != -1)
-		{
-			// check what content types are associated with current extension
-			IContentType[] types = Platform.getContentTypeManager().findContentTypesFor(fileName);
-			int i = 0;
-			while (i < types.length && !valid)
-			{
-				valid = types[i].isKindOf(type);
-				++i;
-			}
-		}
-		else
-			valid = true; // no extension so valid
-		return valid;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/templates/file_templates.xml b/bundles/org.eclipse.wst.xsl.ui/templates/file_templates.xml
deleted file mode 100644
index b956560..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/templates/file_templates.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-<template id="org.eclipse.wst.xslt.templates.xsl_basic"
-       name="Basic stylesheet"
-       context="xsl_new"
-       autoinsert="true"
-       deleted="false"
-       enabled="true"
-       description="Matches the root of the input"><![CDATA[<?xml version="1.0" encoding="${encoding}"?>
-<xsl:stylesheet version="${xsl_version}" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:template match="/">
-		<!-- TODO: Auto-generated template -->${cursor}
-	</xsl:template>
-</xsl:stylesheet>]]></template>
-<template id="org.eclipse.wst.xslt.templates.xsl_copy"
-     name="Copy stylesheet"
-     context="xsl_new"
-     autoinsert="true"
-     deleted="false"
-     enabled="true"
-     description="Makes a copy of the input"><![CDATA[<?xml version="1.0" encoding="${encoding}"?>
-<xsl:stylesheet version="${xsl_version}" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:template match="${cursor}">
-		<!-- TODO: Auto-generated template -->
-	</xsl:template>
-	<!-- standard copy template -->
-	<xsl:template match="@*|node()">
-		<xsl:copy>
-			<xsl:apply-templates select="@*"/>
-			<xsl:apply-templates/>
-		</xsl:copy>
-	</xsl:template>	
-</xsl:stylesheet>]]></template>
-</templates>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.ui/templates/fn.xml b/bundles/org.eclipse.wst.xsl.ui/templates/fn.xml
deleted file mode 100644
index ddbef57..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/templates/fn.xml
+++ /dev/null
@@ -1,766 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--November 17, 2006--><bpel-xpath-functions>
-
-    <!-- Assistants and args repeated in the function defintions below -->
-
-    <assistant name="SimpleDateFormat" type="1">
-        <option value="&quot;yyyy.MM.dd G 'at' HH:mm:ss z&quot;">2001.07.04 AD at 12:08:56 PDT</option>
-        <option value="&quot;EEE, MMM d, ''yy&quot;">Wed, Jul 4, '01</option>
-        <option value="&quot;h:mm a&quot;">12:08 PM</option>
-        <option value="&quot;hh 'o''clock' a, zzzz&quot;">12 o'clock PM, Pacific Daylight Time</option>
-        <option value="&quot;K:mm a, z&quot;">0:08 PM, PDT</option>
-        <option value="&quot;yyyyy.MMMMM.dd GGG hh:mm aaa&quot;">02001.July.04 AD 12:08 PM</option>
-        <option value="&quot;EEE, d MMM yyyy HH:mm:ss Z&quot;">Wed, 4 Jul 2001 12:08:56 -0700</option>
-        <option value="&quot;yyMMddHHmmssZ&quot;">010704120856-0700</option>
-    </assistant>
-
-     <assistant name="LDAPScope">
-        <option value="'subtree'">Subtree Search (starting at the given Distinguished Name)</option>
-        <option value="'onelevel'">Onelevel Search (siblings of given Distinguished Name only)</option>
-        <option value="'object'">Object Search (given Distinguished Name only)</option>
-    </assistant>
-
-    <arg default="" name="dateFormat" optional="true" type="string">
-        <comment>Contains a string formatted according to java.text.SimpleDateFormat format.</comment>
-        <assistant ref="SimpleDateFormat"/>
-    </arg>
-
-    <arg default="" name="ldapfilter" type="string">
-        <comment>An LDAP filter. </comment>
-    </arg>
-
-    <arg default="'subtree'" name="ldapscope" optional="true" type="string">
-        <comment>An LDAP search scope. Values are object,onelevel,subtree.</comment>
-        <assistant ref="LDAPScope"/>
-    </arg>
-
-    <arg default="" name="password" type="string">
-        <comment>The user password.</comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-
-    <arg default="" name="fileName" type="string">
-        <comment>File name from the file system. Note that this file name is in the context of the Oracle BPEL Process Manager.</comment>
-        <assistant ref="filePicker"/>
-    </arg>
-
-    <arg default="" name="xpath" optional="true" type="string">
-        <comment>An XPath expression that resolves in an W3C XML DOM Element node</comment>
-    </arg>
-
-    <arg default="" name="templateURI" type="string">
-        <comment>A URI to the template. </comment>
-        <assistant ref="uriPicker"/>
-    </arg>
-
-    <arg default="" name="xsltInput" type="node">
-        <comment>A W3C XML DOM element. </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="" name="xqueryContext" optional="true" type="node">
-        <comment>A W3C XML DOM element. </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="'1'" name="item" type="number">
-        <comment>Item in array</comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="" name="properties" optional="true" type="node">
-        <comment>A W3C XML DOM element. </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="" name="element1" type="node">
-        <comment>A W3C XML DOM element.  </comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-
-    <arg default="" name="element2" type="node">
-        <comment>A W3C XML DOM element.  </comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-
-
-    <arg default="" name="variableName" type="string">
-        <comment>The source variable for the data</comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-
-    <arg default="" name="partName" optional="true" type="string">
-        <comment>The part to select from the variable</comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-    <arg default="" name="locationPath" optional="true" type="string">
-        <comment>Provides an absolute location path (with '/' meaning the root of the document fragment representing the entire part) to identify the root of a subtree within the document fragment representing the part.</comment>
-    </arg>
-
-    <arg default="" name="index" optional="true" type="number">
-        <comment>Dynamic index value</comment>
-        <assistant ref="xpathPicker"/>
-
-    </arg>
-
-    <arg default="" name="aNode" type="node">
-        <comment>An XML DOM node. </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="" name="xmlContentString" type="string">
-        <comment>XML Content formatted as a string. </comment>
-        <assistant ref="functions"/>
-    </arg>
-
-    <arg default="" name="nodeSet" type="node-set">
-        <comment>An XML DOM Node-Set </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-
-    <arg default="" name="aNodeSet" optional="true" type="node-set">
-        <comment>An XML DOM Node-Set </comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-    <arg default="" name="object" type="object">
-        <comment>Any W3C XML DOM object or node-set.</comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-    <arg default="" name="aBoolean" type="boolean">
-        <comment>A boolean value expression or constant</comment>
-        <assistant ref="xpathPicker"/>
-    </arg>
-    
-    <!-- BPEL functions -->
-
-    
-    <function id="last" returns="number" visual="1">
-        <help>Returns a number equal to context size of the expression evaluation context.
-        </help>
-        <comment>
-            <![CDATA[ Returns a number equal to context size of the expression evaluation context. ]]>
-        </comment>
-    </function>
-
-    <function id="position" returns="number">
-        <help>Returns the index number of the node within the parent.
-            The position of the node is is 1-based, so the first node returns a position of 1. </help>
-        <comment>
-            <![CDATA[ Returns the position, or index number, of the node, relative to all the selected nodes in the node list.
-        The position of the node is is 1-based, so the first node returns a position of 1.]]>
-        </comment>
-    </function>
-
-    <function id="count" returns="number">
-        <help>This XPath 1.0 defined function returns the count of nodes
-            present in the supplied node-set</help>
-        <comment>
-            <![CDATA[ This XPath 1.0 defined function returns the count of nodes
-         present in the supplied node-set ]]>
-        </comment>
-        <arg ref="aNodeSet"/>
-    </function>
-
-
-    <function id="id" returns="node-set">
-        <help>Selects elements by their unique ID</help>
-        <comment>
-            <![CDATA[ Selects elements by their unique ID, <p>
-          When the argument is of type node-set, the result is the union of the
-          result of applying id() to the string value of each of the nodes in
-          the node-set argument.
-<p>
-When the argument is of any other type, it is converted to a string
-and then split into a white space separated list of tokens (white space is
-any sequence of characters matching the production); the result
-is a node-set containing the elements in the same document as the context
-node that have a unique ID equal to any of the tokens in the list. ]]>
-        </comment>
-
-        <arg default="" name="object" type="object">
-            <comment>The object or objects to apply the id function to.</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-
-    <function id="local-name" returns="string">
-        <help>Returns the local part of the expanded name of the node in the node-set argument that is first in document order</help>
-        <comment>
-            <![CDATA[ Returns the local part of the expanded name of the node in the node-set
-        argument that is first in document order. <p>
-
-    ]]>
-        </comment>
-        <arg ref="nodeSet"/>
-    </function>
-
-
-    <function id="namespace-uri" returns="string">
-        <help>Returns the namespace Uniform Resource Identifier (URI) of the expanded name of the node
-            in the node-set argument that is first in document order.</help>
-        <comment>
-            <![CDATA[ Returns the namespace Uniform Resource Identifier
-        (URI) of the expanded name of the node in the node-set
-        argument that is first in document order.
-
-     ]]>
-        </comment>
-        <arg ref="nodeSet"/>
-    </function>
-
-
-    <function id="name" returns="string">
-        <help>Returns a string containing a QName representing the expanded
-            name of the node in the node-set argument that is first in document
-            order.
-        </help>
-        <comment>
-            <![CDATA[ Returns a string containing a QName representing
-        the expanded name of the node in the node-set argument
-        that is first in document order.
-     ]]>
-        </comment>
-        <arg ref="nodeSet"/>
-    </function>
-
-
-    <function id="string" returns="string" visual="1">
-        <help>Converts an object to a string.</help>
-        <comment>
-            <![CDATA[Converts an object to a string. ]]>
-        </comment>
-        <arg ref="object"/>
-    </function>
-
-    <function id="concat" returns="string">
-        <help>This XPath 1.0 defined function concatenates several strings together.</help>
-        <comment>
-            <![CDATA[ This XPath 1.0 defined function concatenates several strings together.]]>
-        </comment>
-
-        <arg default="" name="firstString" type="string">
-            <comment>First string to concatenate with</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="nextString" type="string">
-            <comment>Next string to concatenate with</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="oneMoreString" optional="*" type="string">
-            <comment>One more string. You can concatenate several strings at once.</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-    <function id="contains" returns="string">
-        <help>Checks whether the first argument string contains
-            the second argument string.</help>
-        <comment>
-            <![CDATA[ Checks whether the first argument string
-        contains the second argument string. ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to inspect</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="searchString" type="string">
-            <comment>The search string </comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-
-    <function id="substring-before" returns="string">
-        <help>Returns the substring of the first argument string that
-            precedes the first occurrence of the second argument string
-            in the first argument string, or the empty string if
-            the first argument string does not contain the second argument
-            string.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>substring-before Function</H1>
-  <P class=dtP>Returns the substring of the first argument string that precedes the first
-  occurrence of the second argument string in the first argument string, or the
-  empty string if the first argument string does not contain the second argument
-  string.</P><PRE class=syntax><I>string</I> substring-before(<I>string</I>, <I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>If an argument is not of type <I>string,</I> it is first converted to a
-  string and then evaluated.</P>
-  <P class=dtP>The following function call returns "1999":</P><PRE class=code>substring-before("1999/04/01","/")</PRE>
-  <P class=dtP>The following function call returns an empty string "":</P><PRE class=code>substring-before("1999/04/01","2")</PRE>
-  </div>
-
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to search in</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="searchString" type="string">
-            <comment>The search string </comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-
-    <function id="substring-after" returns="string">
-        <help>Returns the substring of the first argument string that
-            follows the first occurrence of the second argument string
-            in the first argument string, or the empty string if
-            the first argument string does not contain the second argument
-            string.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-
-  <H1 class=dtH1>substring-after Function</H1>
-  <P class=dtP>Returns the substring of the first argument string that follows the first
-  occurrence of the second argument string in the first argument string, or the
-  empty string if the first argument string does not contain the second argument
-  string.</P><PRE class=syntax><I>string</I> substring-after(<I>string</I>, <I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>If an argument is not of type <I>string,</I> it is first converted to a
-  string and then evaluated.</P>
-  <P class=dtP>The following function call returns "04/01":</P><PRE class=code>substring-after("1999/04/01","/")</PRE>
-  <P class=dtP>The following function call returns "99/04/01":</P><PRE class=code>substring-after("1999/04/01","19")</PRE>
-  <P class=dtP>The following function call returns an empty string "":</P><PRE class=code>substring-after("1999/04/01","2")</PRE>
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to search in</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="searchString" type="string">
-            <comment>The search string </comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-    <function id="starts-with" returns="boolean">
-        <help>Returns true if the first argument string starts with
-            the second argument string; otherwise returns false.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>starts-with Function</H1>
-  <P class=dtP>Returns true if the first argument string starts with the second argument
-  string; otherwise returns false.</P><PRE class=syntax><I>boolean</I> starts-with(<I>string</I>, <I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>If an argument is not of type <I>string,</I> it is first converted to a
-  string and then evaluated. The function is case-sensitive.</P>
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to search in</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="searchString" type="string">
-            <comment>The search string </comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-
-    <function id="substring" returns="string">
-        <help>Returns the substring of the first argument
-            starting at the position specified in the second argument
-            and the length specified in the third argument.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>substring Function</H1>
-  <P class=dtP>Returns the substring of the first argument starting at the position
-  specified in the second argument and the length specified in the third
-  argument.</P><PRE class=syntax><I>string</I> substring(<I>string</I>, <I>number</I>, <I>number</I>?)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>Each character in the string is considered to have a numeric position: the
-  position of the first character is 1, the position of the second character is 2,
-  and so on.</P>
-  <P class=dtP>If the third argument is not specified, it returns the substring starting at
-  the position specified in the second argument and continuing to the end of the
-  string.</P>
-  <P class=dtP>The following function call returns "234":</P><PRE class=code>substring("12345",2,3) </PRE>
-  <P class=dtP>The following function call returns "2345":</P><PRE class=code>substring("12345",2) </PRE>
-  <P class=dtP>The returned substring contains those characters for which the position of
-  the character is greater than or equal to the rounded value of the second
-  argument, and if the third argument is specified, less than the sum of the
-  rounded value of the second argument and the rounded value of the third
-  argument. The comparisons and addition used for the preceding follow the
-  standard IEEE 754 rules; rounding is done as if by a call to the <CODE
-  class=ce>round()</CODE> function.</P>
-  <P class=dtP>The following examples illustrate unusual cases.</P>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", 1.5, 2.6)</CODE>
-  returns "<CODE class=ce>234</CODE>"</BLOCKQUOTE>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", 0, 3)</CODE> returns
-  "<CODE class=ce>12</CODE>"</BLOCKQUOTE>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", 0 div 0, 3)</CODE>
-  returns <CODE class=ce>""</CODE></BLOCKQUOTE>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", 1, 0 div 0)</CODE>
-  returns <CODE class=ce>""</CODE></BLOCKQUOTE>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", -42, 1 div 0)</CODE>
-  returns <CODE class=ce>"12345"</CODE></BLOCKQUOTE>
-  <BLOCKQUOTE class=dtBlock><CODE class=ce>substring("12345", -1 div 0, 1 div 0)</CODE> returns <CODE class=ce>""</CODE></BLOCKQUOTE>
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to compute substring on</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="startPosition" type="number">
-            <comment>Start Position (first position is index == 1)</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-        <arg default="" name="length" optional="true" type="number">
-            <comment>Length of characters to extract</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-    <function id="string-length" returns="number">
-        <help>Returns the number of characters in the string.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>string-length Function</H1>
-  <P class=dtP>Returns the number of characters in the string.</P><PRE class=syntax><I>number</I> string-length(<I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>If the argument is omitted, it returns the number of characters in the
-  string-value of the context node.</P>
-  <P class=dtP>The following function call returns 4:</P><PRE class=code>string-length("abcd")</PRE>
-  <P class=dtP>The following function call returns 5:</P><PRE class=code>string-length("ab cd")</PRE>
-  <P class=dtP>If an argument is not of type <I>string,</I> it is first converted to a
-  string and then evaluated.</P>
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to compute the length on</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-    <function id="normalize-space" returns="string">
-        <help>Returns the argument string with the white space stripped.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>normalize-space Function</H1>
-  <P class=dtP>Returns the argument string with the leading, trailing, and repeating white
-  spaces stripped.</P><PRE class=syntax><I>string</I> normalize-space(<I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>White space is normalized by stripping leading and trailing white space and
-  replacing sequences of white space characters with a single space. If the
-  argument is omitted, the string-value of the context node is normalized and
-  returned.</P>
-  <P class=dtP>The following function call returns "abc def":</P><PRE class=code>normalize-space("  abc    def  ")</PRE>
-  <P class=dtP>If an argument is not of the type string<I>,</I> it is first converted to a
-  string and then evaluated. See the example below.</P>
-
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to normalize</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-    <function id="translate" returns="string">
-        <help>Returns the first argument string with occurrences
-            of characters in the second argument string replaced by
-            the character at the corresponding position in the third
-            argument string.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>translate Function</H1>
-  <P class=dtP>Returns the first argument string with occurrences of characters in the
-  second argument string replaced by the character at the corresponding position
-  in the third argument string.</P><PRE class=syntax><I>string</I> translate(<I>string</I>, <I>string</I>, <I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>This function provides a mapping of characters on the first argument. The
-  second and third arguments describes the scheme of the mapping. </P>
-  <P class=dtP>The following function call returns "BAr":</P><PRE class=code>translate("bar","abc","ABC")</PRE>
-  <P class=dtP>If there is a character in the second argument string with no character at a
-  corresponding position in the third argument string (because the second argument
-  string is longer than the third argument string), occurrences of that character
-  in the first argument string are removed.</P>
-  <P class=dtP>The following function call returns "AAA":</P><PRE class=code>translate("--aaa--","abc-","ABC")</PRE>
-  <P class=dtP>If a character occurs more than once in the second argument string, the first
-  occurrence determines the replacement character. If the third argument string is
-  longer than the second argument string, excess characters are ignored.</P>
-  <P class=dtP>If an argument is not of type <I>string,</I> it is first converted to a
-  string and then evaluated.</P>
-
-
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="aString" type="string">
-            <comment>The string to translate</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-        <arg default="" name="strOccur" type="string">
-            <comment>The string to translate from</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-        <arg default="" name="strRepl" type="string">
-            <comment>The string to translate to</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-
-    <!-- Boolean functions -->
-
-
-    <function id="boolean" returns="boolean" visual="1">
-        <help>Converts the argument to a Boolean.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>boolean Function</H1>
-  <P class=dtP>Converts the argument to a Boolean.</P><PRE class=syntax><I>boolean</I> boolean(<I>value</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>Converts argument to a Boolean as follows.
-  <UL type=disc>
-  <LI>A negative or positive number is true<CODE class=ce> </CODE>and any value
-  that contains either zero or a NaN value
-  is false.
-  <LI>A node-set is false if empty and only true if it is nonempty.
-  <LI>A string is false if it is zero-length and only true<CODE class=ce>
-  </CODE>if its length is greater than zero.
-  <LI>An object of a type other than the four basic types is converted to a
-  Boolean in a way that is dependent on that type. </LI></UL>
-
-  </div>
-        ]]>
-        </comment>
-        <arg ref="object"/>
-    </function>
-
-
-    <function id="not" returns="boolean">
-        <help>Returns true if the argument is false; otherwise false.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>not Function</H1>
-  <P class=dt>Returns true if the argument is false; otherwise false.</P><PRE class=syntax><I>boolean</I> not(boolean)</PRE>
-
-  </div>
-        ]]>
-        </comment>
-        <arg ref="aBoolean"/>
-    </function>
-
-
-    <function id="true" returns="boolean">
-        <help>Returns true.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>true Function</H1>
-  <P class=dtP>Returns true.</P><PRE class=syntax><I>boolean</I> true()</PRE>
-
-  </div>
-        ]]>
-        </comment>
-    </function>
-
-
-    <function id="false" returns="boolean">
-        <help>Returns false.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>false Function</H1>
-  <P class=dtP>Returns false.</P><PRE class=syntax><I>boolean</I> false()</PRE>
-
-  </div>
-        ]]>
-        </comment>
-    </function>
-
-
-    <function id="lang" returns="boolean">
-        <help>Returns true if the xml:lang attribute of the
-            context node is the same as the argument string.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>lang Function</H1>
-  <P class=dtP>Returns true if the <CODE class=ce>xml:lang</CODE> attribute of the context
-  node is the same as a sublanguage of the language specified by the argument
-  string.</P>
-  <H4 class=dtH4>Syntax</H4><PRE class=syntax><I>boolean</I> lang(<I>string</I>)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>The language of the context node is determined by the value of the <CODE
-  class=ce>xml:lang</CODE> attribute on the context node, or if the context node
-  has no <CODE class=ce>xml:lang</CODE> attribute, by the value of the <CODE
-  class=ce>xml:lang</CODE> attribute on the nearest ancestor of the context node
-  that has an <CODE class=ce>xml:lang</CODE> attribute. If there is no such
-  attribute, <CODE class=ce>lang()</CODE> returns false. If there is such an
-  attribute, <CODE class=ce>lang()</CODE> returns true if the attribute value is
-  equal to the argument (ignoring case) or if there is a suffix starting with
-  "<CODE class=ce>-</CODE>", such that the attribute value is equal to the
-  argument, ignoring the suffix of the attribute value and ignoring case.</P>
-  <P class=dtP>Given the following XML elements:</P><PRE class=code>&lt;para xml:lang="en"/&gt;
-  &lt;div xml:lang="en"&gt;&lt;para/&gt;&lt;/div&gt;
-  &lt;para xml:lang="EN"/&gt;
-  &lt;para xml:lang="en-us"/&gt;</PRE>
-  <P class=dtP>The following function call returns true for all:</P><PRE class=code>lang("en")</PRE>
-
-  </div>
-        ]]>
-        </comment>
-
-        <arg ref="aString"/>
-    </function>
-
-
-    <!-- Number functions -->
-
-    <function id="number" returns="number" visual="1">
-        <help>Evaluates the argument expressions to obtain a numeric result.</help>
-        <comment>
-            <![CDATA[<div class="xpathHelp">
-  <H1 class=dtH1>number Function</H1>
-  <P class=dtP>Converts the argument to a number.</P><PRE class=syntax><I>number</I> number(<I>object</I>?)</PRE>
-  <H4 class=dtH4>Remarks</H4>
-  <P class=dtP>Converts its argument to a number as follows.
-  <UL type=disc>
-  <LI>A string that consists of optional white space followed by an optional minus
-  sign followed by a number followed by white space is converted to the IEEE 754
-  number that is nearest (according to the IEEE 754 round-to-nearest rule) to the
-  mathematical value represented by the string; any other string is converted to
-  NaN.
-  <LI>Boolean true is converted to 1; Boolean false is converted to 0.
-  <LI>A node-set is first converted to a string and then converted in the same way
-  as a string argument.
-  <LI>An object of a type other than the four basic types (node-set, Boolean,
-  number, or string) is converted to a number in a way that is dependent on that
-  type. </LI></UL>
-  <P class=dtP>If the argument is omitted, it defaults to a node-set with the context node
-  as its only member.</P>
-  <BLOCKQUOTE class=dtBlock><B class=le>Note&nbsp;&nbsp;&nbsp;</B>The <CODE
-  class=ce>number()</CODE> function should not be used for conversion of numeric
-  data occurring in an element in an XML document unless the element is of a type
-  that represents numeric data in a language-neutral format (that would typically
-  be transformed into a language-specific format for presentation to a user). In
-  addition, the <CODE class=ce>number()</CODE> function cannot be used unless the
-  language-neutral format used by the element is consistent with the XML Path
-  Language (XPath) syntax for a number.</BLOCKQUOTE>
-
-  </div>
-        ]]>
-        </comment>
-
-        <arg default="" name="object" optional="true" type="object">
-            <comment>Any W3C XML DOM object or node-set.</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-    </function>
-
-    <function id="sum" returns="number">
-        <help>Returns the sum of all nodes in the node-set. Each node
-            is first converted to a number value before summing.</help>
-        <comment>
-            <![CDATA[<H1 class=dtH1>sum Function</H1>
-<P class=dtP>Returns the sum of all nodes in the node-set. Each node is first converted to
-a number value before summing.</P><PRE class=syntax><I>number</I> sum(<I>node-set</I>)</PRE>
-            ]]>
-        </comment>
-
-        <arg ref="nodeSet"/>&gt;
-
-    </function>
-
-
-    <function id="floor" returns="number">
-        <help>Returns the largest integer that is not greater
-            than the argument.</help>
-        <comment>
-            <![CDATA[<H1 class=dtH1>floor Function</H1>
-<P class=dtP>Returns the largest integer that is not
-greater than the argument.</P>
-<PRE class=syntax><I>number</I> floor(<I>number</I>)</PRE>
-  ]]>
-        </comment>
-
-        <arg default="" name="aNumber" type="number">
-            <comment>Number to compute the floor of</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-    <function id="ceiling" returns="number">
-        <help>Returns the smallest integer that is not less than the argument.</help>
-        <comment>
-            <![CDATA[
-    <H1 class=dtH1>ceiling Function</H1>
-    <P class=dtP>Returns the smallest integer that is not
-    less than the argument.</P>
-    <PRE class=syntax><I>number</I> ceiling(<I>number</I>)</PRE>
-
-    ]]>
-        </comment>
-
-        <arg default="" name="aNumber" type="number">
-            <comment>Number to compute the ceiling of</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-    <function id="round" returns="number">
-        <help>Returns an integer closest in value to the argument.</help>
-        <comment>
-            <![CDATA[
-    <H1 class=dtH1>round Function</H1>
-    <P class=dtP>Returns an integer closest in value to the argument.</P><PRE class=syntax><I>number</I> round(<I>number</I>)</PRE>
-    <H4 class=dtH4>Remarks</H4>
-    <P class=dtP>If there are two such numbers, the one that is closest to positive infinity
-    is returned.</P>
-    <P class=dtP>If the argument is NaN, NaN is returned.</P>
-    <P class=dtP>If the argument is positive infinity, positive infinity is returned.</P>
-    <P class=dtP>If the argument is negative infinity, negative infinity is returned.</P>
-    <P class=dtP>If the argument is positive zero, positive zero is returned.</P>
-    <P class=dtP>If the argument is negative zero, negative zero is returned.</P>
-    <P class=dtP>If the argument is less than zero but greater than or equal to -0.5, negative
-    zero is returned.</P>
-    <P class=dtP>For the last two cases, the result of calling the <CODE
-    class=ce>round()</CODE> function is not the same as the result of adding 0.5 and
-    then calling the <CODE class=ce>floor()</CODE> function because positive zero
-    will be returned in such cases.</P>
-
-    ]]>
-        </comment>
-
-        <arg default="" name="aNumber" type="number">
-            <comment>Number to round up</comment>
-            <assistant ref="xpathPicker"/>
-        </arg>
-
-    </function>
-
-
-</bpel-xpath-functions>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.ui/templates/xpath_axis_templates.xml b/bundles/org.eclipse.wst.xsl.ui/templates/xpath_axis_templates.xml
deleted file mode 100644
index e3545a9..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/templates/xpath_axis_templates.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-	<template id="org.eclipse.wst.xslt.templates.xpath.axis.child"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The child axis contains the children of the context node"
-	          enabled="true" name="child::">child::${cursor}</template>
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.descendant"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The descendant axis contains the descendants of the context node; a descendant is a child or a child of a child and so on; thus the descendant axis never contains attribute or namespace nodes"
-	          enabled="true" name="descendant::">descendant::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.parent"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The parent axis contains the parent of the context node, if there is one."
-	          enabled="true" name="parent::">parent::${cursor}</template>
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.parentshortcut"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description=".. is a shortcut for the parent:: axis. The parent axis contains the parent of the context node, if there is one."
-	          enabled="true" name="..">../${cursor}</template>	          
-	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.ancestor"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The ancestor axis contains the ancestors of the context node; the ancestors of the context node consist of the parent of context node and the parent's parent and so on; thus, the ancestor axis will always include the root node, unless the context node is the root node."
-	          enabled="true" name="ancestor::">ancestor::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.followingsibling"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The following-sibling axis contains all the following siblings of the context node; if the context node is an attribute node or namespace node, the following-sibling axis is empty"
-	          enabled="true" name="following-sibling::">following-sibling::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.preceding-sibling"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The preceding-sibling axis contains all the preceding siblings of the context node; if the context node is an attribute node or namespace node, the preceding-sibling axis is empty."
-	          enabled="true" name="preceding-sibling::">preceding-sibling::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.following"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The following axis contains all nodes in the same document as the context node that are after the context node in document order, excluding any descendants and excluding attribute nodes and namespace nodes."
-	          enabled="true" name="following::">following::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.preceding"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The preceding axis contains all nodes in the same document as the context node that are before the context node in document order, excluding any ancestors and excluding attribute nodes and namespace nodes."
-	          enabled="true" name="preceding::">preceding::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.attribute"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The attribute axis contains the attributes of the context node; the axis will be empty unless the context node is an element."
-	          enabled="true" name="attribute::">attribute::${cursor}</template>
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.attributeshortcut"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="@ is a short cut for the attribute:: axis. The attribute axis contains the attributes of the context node; the axis will be empty unless the context node is an element."
-	          enabled="true" name="@">@${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.namespace"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The namespace axis contains the namespace nodes of the context node; the axis will be empty unless the context node is an element."
-	          enabled="true" name="namespace::">attribute::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.self"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The self axis contains just the context node itself."
-	          enabled="true" name="self::">self::${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.axis.selfshortcut"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description=". is a short cut for the self:: axis. The self axis contains just the context node itself."
-	          enabled="true" name=".">.${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.descendantorself"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="The descendant-or-self axis contains the context node and the descendants of the context node."
-	          enabled="true" name="descendant-or-self::">descendant-or-self::${cursor}</template>	          
-   	<template id="org.eclipse.wst.xslt.templates.xpath.axis.ancestororself"
-	          autoinsert="true" context="xpath_axis" deleted="false"
-	          description="the ancestor-or-self axis contains the context node and the ancestors of the context node; thus, the ancestor axis will always include the root node."
-	          enabled="true" name="ancestor-or-self::">ancestor-or-self::${cursor}</template>	          
-	          	          
-</templates>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.ui/templates/xpath_operator_templates.xml b/bundles/org.eclipse.wst.xsl.ui/templates/xpath_operator_templates.xml
deleted file mode 100644
index dcca9b6..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/templates/xpath_operator_templates.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.addition"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Addition"
-	          enabled="true" name="+">+ ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.subtraction"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Subtraction"
-	          enabled="true" name="-">- ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.multiplication"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Multiplication"
-	          enabled="true" name="*">* ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.division"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Division"
-	          enabled="true" name="div">div ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.equal"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Equal"
-	          enabled="true" name="=">= ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.notequal"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Not Equal"
-	          enabled="true" name="!=">!= ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.lessthan"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Less Than"
-	          enabled="true" name="&lt;">&amp;lt; ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.lessthanorequal"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Less Than or equal to"
-	          enabled="true" name="&lt;">&amp;lt;= ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.greaterthan"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Greater than"
-	          enabled="true" name=">">> ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.greaterthanorequal"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Greater than or equal to"
-	          enabled="true" name=">=">>= ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.or"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="or"
-	          enabled="true" name="or">or ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.and"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="and"
-	          enabled="true" name="and">and ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.string"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Modulus (division remainder)"
-	          enabled="true" name="mod">mod ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.operator.ornodes"
-	          autoinsert="true" context="xpath_operator" deleted="false"
-	          description="Computes two node sets. i.e. //book | //cd"
-	          enabled="true" name="|">| ${cursor}</template>
-	          
-</templates>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.ui/templates/xpath_templates.xml b/bundles/org.eclipse.wst.xsl.ui/templates/xpath_templates.xml
deleted file mode 100644
index 815edd1..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/templates/xpath_templates.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  Descriptions for the XPath functions come from the XPath 1.0 specification
-  maintained by the Word Wide Web Consortium.  The specification can be found
-  at:
-  
-  http://www.w3.org/TR/xpath
- -->
-<templates>
-	<template id="org.eclipse.wst.xslt.templates.xpath.last"
-		autoinsert="true" context="xsl_xpath" deleted="false"
-		description="The last function returns a number equal to the context size from the expression evaluation context."
-		enabled="true" name="last()">last()</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.postion"
-		autoinsert="true" context="xsl_xpath" deleted="false"
-		description="The position function returns a number equal to the context position from the expression evaluation context."
-		enabled="true" name="position()">position()</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.count"
-	          autoinsert="true" context="xml_xpath" deleted="false"
-	          description=""
-	          enabled="true" name="count(node-set)">count(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.id"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The id function selects elements by their unique ID. When the argument to id is of type node-set, then the result is the union of the result of applying id to the string-value of each of the nodes in the argument node-set. When the argument to id is of any other type, the argument is converted to a string as if by a call to the string function; the string is split into a whitespace-separated list of tokens (whitespace is any sequence of characters matching the production S); the result is a node-set containing the elements in the same document as the context node that have a unique ID equal to any of the tokens in the list."
-	          enabled="true" name="id(node-set)">id(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.local_name"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The local-name function returns the local part of the expanded-name of the node in the argument node-set that is first in document order. If the argument node-set is empty or the first node has no expanded-name, an empty string is returned. If the argument is omitted, it defaults to a node-set with the context node as its only member."
-	          enabled="true" name="local-name(node-set)">local-name(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.namespace_uri"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The namespace-uri function returns the namespace URI of the expanded-name of the node in the argument node-set that is first in document order. If the argument node-set is empty, the first node has no expanded-name, or the namespace URI of the expanded-name is null, an empty string is returned. If the argument is omitted, it defaults to a node-set with the context node as its only member."
-	          enabled="true" name="namespace_uri(node-set)">namespace_uri(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.name"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The name function returns a string containing a QName representing the expanded-name of the node in the argument node-set that is first in document order. The QName must represent the expanded-name with respect to the namespace declarations in effect on the node whose expanded-name is being represented. Typically, this will be the QName that occurred in the XML source. This need not be the case if there are namespace declarations in effect on the node that associate multiple prefixes with the same namespace. However, an implementation may include information about the original prefix in its representation of nodes; in this case, an implementation can ensure that the returned string is always the same as the QName used in the XML source. If the argument node-set is empty or the first node has no expanded-name, an empty string is returned. If the argument it omitted, it defaults to a node-set with the context node as its only member."
-	          enabled="true" name="name(node-set)">name(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.string"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="Returns the string value of the argument. The argument could be a number, boolean, or node-set"
-	          enabled="true" name="string(arg)">string(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.concat"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The concat function returns the concatenation of its arguments."
-	          enabled="true" name="concat(string, string, string*)">concat(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.startswith"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The starts-with function returns true if the first argument string starts with the second argument string, and otherwise returns false."
-	          enabled="true" name="starts-with(arg, arg)">starts-with(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.contains"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description="The contains function returns true if the first argument string contains the second argument string, and otherwise returns false."
-	          enabled="true" name="contains(string, string)">contains(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.substringbefore"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The substring-before function returns the substring of the first argument string that precedes the first occurrence of the second argument string in the first argument string, or the empty string if the first argument string does not contain the second argument string. For example, substring-before("1999/04/01","/") returns 1999.'
-	          enabled="true" name="substring-before(string, string)">substring-before(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.substringafter"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The substring-after function returns the substring of the first argument string that follows the first occurrence of the second argument string in the first argument string, or the empty string if the first argument string does not contain the second argument string. For example, substring-after("1999/04/01","/") returns 04/01, and substring-after("1999/04/01","19") returns 99/04/01.'
-	          enabled="true" name="substring-after(string, string)">substring-after(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.substring"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The substring function returns the substring of the first argument starting at the position specified in the second argument with length specified in the third argument. For example, substring("12345",2,3) returns "234". If the third argument is not specified, it returns the substring starting at the position specified in the second argument and continuing to the end of the string. For example, substring("12345",2) returns "2345".'
-	          enabled="true" name="substring(string, number, number?)">substring(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.stringlength"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The string-length returns the number of characters in the string. If the argument is omitted, it defaults to the context node converted to a string, in other words the string-value of the context node.'
-	          enabled="true" name="string-length(string?)">string-length(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.normalizespace"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The normalize-space function returns the argument string with whitespace normalized by stripping leading and trailing whitespace and replacing sequences of whitespace characters by a single space. Whitespace characters are the same as those allowed by the S production in XML. If the argument is omitted, it defaults to the context node converted to a string, in other words the string-value of the context node.'
-	          enabled="true" name="normalize-space(string?)">normalize-space(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.translate"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The normalize-space function returns the argument string with whitespace normalized by stripping leading and trailing whitespace and replacing sequences of whitespace characters by a single space. Whitespace characters are the same as those allowed by the S production in XML. If the argument is omitted, it defaults to the context node converted to a string, in other words the string-value of the context node.'
-	          enabled="true" name="translate(string, string, string)">translate(${cursor}, , )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.boolean"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='Returns a boolean value for a number, string, or node-set'
-	          enabled="true" name="boolean(arg)">boolean(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.not"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The not function returns true if its argument is false, and false otherwise.'
-	          enabled="true" name="not(boolean)">not(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.true"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='Returns a boolean true value.'
-	          enabled="true" name="true()">true()${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.false"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='Returns a boolean false value.'
-	          enabled="true" name="false()">false()${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.lang"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The lang function returns true or false depending on whether the language of the context node as specified by xml:lang attributes is the same as or is a sublanguage of the language specified by the argument string. The language of the context node is determined by the value of the xml:lang attribute on the context node, or, if the context node has no xml:lang attribute, by the value of the xml:lang attribute on the nearest ancestor of the context node that has an xml:lang attribute. If there is no such attribute, then lang returns false. If there is such an attribute, then lang returns true if the attribute value is equal to the argument ignoring case, or if there is some suffix starting with - such that the attribute value is equal to the argument ignoring that suffix of the attribute value and ignoring case.'
-	          enabled="true" name="lang(string)">lang(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.number"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='Returns a boolean false value.'
-	          enabled="true" name="number(arg)">number(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.number"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='Returns the numeric value of the argument. The argument could be a boolean, string, or node-set.'
-	          enabled="true" name="number(arg)">number(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.sum"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The sum function returns the sum, for each node in the argument node-set, of the result of converting the string-values of the node to a number.'
-	          enabled="true" name="sum(node-set)">sum(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.floor"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The floor function returns the largest (closest to positive infinity) number that is not greater than the argument and that is an integer.'
-	          enabled="true" name="floor(number)">floor(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.ceiling"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The ceiling function returns the smallest (closest to negative infinity) number that is not less than the argument and that is an integer.'
-	          enabled="true" name="ceiling(number)">ceiling(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.round"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The round function returns the number that is closest to the argument and that is an integer. If there are two such numbers, then the one that is closest to positive infinity is returned. If the argument is NaN, then NaN is returned. If the argument is positive infinity, then positive infinity is returned. If the argument is negative infinity, then negative infinity is returned. If the argument is positive zero, then positive zero is returned. If the argument is negative zero, then negative zero is returned. If the argument is less than zero, but greater than or equal to -0.5, then negative zero is returned.'
-	          enabled="true" name="round(number)">round(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.round"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='The round function returns the number that is closest to the argument and that is an integer. If there are two such numbers, then the one that is closest to positive infinity is returned. If the argument is NaN, then NaN is returned. If the argument is positive infinity, then positive infinity is returned. If the argument is negative infinity, then negative infinity is returned. If the argument is positive zero, then positive zero is returned. If the argument is negative zero, then negative zero is returned. If the argument is less than zero, but greater than or equal to -0.5, then negative zero is returned.'
-	          enabled="true" name="round(number)">round(${cursor})</template>
-	          
-	<!-- XSL XPath Extensions -->
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslkey"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The key function does for keys what the id function does for IDs. The first argument specifies the name of the key. The value of the argument must be a QName, which is expanded as described in [2.4 Qualified Names]. When the second argument to the key function is of type node-set, then the result is the union of the result of applying the key function to the string value of each of the nodes in the argument node-set. When the second argument to key is of any other type, the argument is converted to a string as if by a call to the string function; it returns a node-set containing the nodes in the same document as the context node that have a value for the named key equal to this string. '
-	          enabled="true" name="key(string, arg)">key(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xsldocument"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function:The document function allows access to XML documents other than the main source document.'
-	          enabled="true" name="document(arg, node-set?)">document(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslformatnumber"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The format-number function converts its first argument to a string using the format pattern string specified by the second argument and the decimal-format named by the third argument, or the default decimal-format, if there is no third argument.'
-	          enabled="true" name="format-number(number, string, string?)">format-number(${cursor}, )</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslcurrent"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The current function returns a node-set that has the current node as its only member. For an outermost expression (an expression not occurring within another expression), the current node is always the same as the context node.'
-	          enabled="true" name="current()">current() ${cursor}</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslunparseentityuri"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The unparsed-entity-uri returns the URI of the unparsed entity with the specified name in the same document as the context node (see [3.3 Unparsed Entities]). It returns the empty string if there is no such entity.'
-	          enabled="true" name="unparsed-entity-uri(string)">unparsed-entity-uri(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslgenerateid"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The generate-id function returns a string that uniquely identifies the node in the argument node-set that is first in document order. The unique identifier must consist of ASCII alphanumeric characters and must start with an alphabetic character. Thus, the string is syntactically an XML name. An implementation is free to generate an identifier in any convenient way provided that it always generates the same identifier for the same node and that different identifiers are always generated from different nodes. An implementation is under no obligation to generate the same identifiers each time a document is transformed. There is no guarantee that a generated unique identifier will be distinct from any unique IDs specified in the source document. If the argument node-set is empty, the empty string is returned. If the argument is omitted, it defaults to the context node.'
-	          enabled="true" name="generate-id(node-set?)">generate-id(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslsystemproperty"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The argument must evaluate to a string that is a QName. The QName is expanded into a name using the namespace declarations in scope for the expression. The system-property function returns an object representing the value of the system property identified by the name. If there is no such system property, the empty string should be returned.'	
-	          enabled="true" name="system-property(string)">system-property(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslelementavailable"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The argument must evaluate to a string that is a QName. The QName is expanded into an expanded-name using the namespace declarations in scope for the expression. The element-available function returns true if and only if the expanded-name is the name of an instruction. If the expanded-name has a namespace URI equal to the XSLT namespace URI, then it refers to an element defined by XSLT. Otherwise, it refers to an extension element. If the expanded-name has a null namespace URI, the element-available function will return false. '	
-	          enabled="true" name="element-available(string)">element-available(${cursor})</template>
-	<template id="org.eclipse.wst.xslt.templates.xpath.xslfunctionavailable"
-	          autoinsert="true" context="xsl_xpath" deleted="false"
-	          description='XSL XPath Extension Function: The argument must evaluate to a string that is a QName. The QName is expanded into an expanded-name using the namespace declarations in scope for the expression. The function-available function returns true if and only if the expanded-name is the name of a function in the function library. If the expanded-name has a non-null namespace URI, then it refers to an extension function; otherwise, it refers to a function defined by XPath or XSLT.'	
-	          enabled="true" name="function-available(string)">function-available(${cursor})</template>
-  
-</templates>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.xalan/.classpath b/bundles/org.eclipse.wst.xsl.xalan/.classpath
deleted file mode 100644
index 9472305..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-debugger"/>
-	<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.4"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsl.xalan/.cvsignore b/bundles/org.eclipse.wst.xsl.xalan/.cvsignore
deleted file mode 100644
index 50b76ba..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-javaCompiler.xalan-debugger.jar.args
-build.xml
-xalan-debugger.jar
-temp.folder
diff --git a/bundles/org.eclipse.wst.xsl.xalan/.project b/bundles/org.eclipse.wst.xsl.xalan/.project
deleted file mode 100644
index 0594060..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.xalan</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/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 8ba1309..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jan 03 22:24:50 EST 2008
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 50bc347..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Sun Dec 16 08:48:52 GMT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fdd8568..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Fri Jan 04 09:04:43 EST 2008
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.missing-bundle-classpath-entries=0
-compilers.p.missing-packages=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=1
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.xsl.xalan/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.xalan/META-INF/MANIFEST.MF
deleted file mode 100644
index 8e1e415..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsl.xalan;singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.wst.xsl.xalan.debugger
-Require-Bundle: org.apache.xml.serializer;bundle-version="2.7.1",
- org.apache.xml.resolver;bundle-version="[1.2.0,1.3.0)",
- org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
- org.apache.commons.logging;bundle-version="1.0.4",
- org.apache.xalan;bundle-version="[2.7.0,2.8.0)",
- org.eclipse.wst.xsl.debug;bundle-version="[0.5.0,1.0.0)"
-Bundle-ClassPath: xalan-debugger.jar
diff --git a/bundles/org.eclipse.wst.xsl.xalan/XalanFeatures.properties b/bundles/org.eclipse.wst.xsl.xalan/XalanFeatures.properties
deleted file mode 100644
index 7c6da7a..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/XalanFeatures.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Doug Satchwell (Chase Technology Ltd) - initial API and implementation
-###############################################################################
-OPTIMIZE=http://apache.org/xalan/features/optimize
-OPTIMIZE.TYPE=boolean
-OPTIMIZE.DESC=Optimize stylesheet processing. By default, this attribute is set to true. You may need to set it to false for tooling applications.
-
-INCREMENTAL=http://apache.org/xalan/features/incremental
-INCREMENTAL.TYPE=boolean
-INCREMENTAL.DESC=Produce output incrementally, rather than waiting to finish parsing the input before generating any output. By default this attribute is set to false. You can turn this attribute on to transform large documents where the stylesheet structure is optimized to execute individual templates without having to parse the entire document.
-
-SOURCE_LOCATION=http://apache.org/xalan/features/source_location
-SOURCE_LOCATION.TYPE=boolean
-SOURCE_LOCATION.DESC=By default, this attribute is set to false. Setting this attribute to true involves a substantial increase in storage cost per source document node. If you want to use the NodeInfo extension functions (or some other mechanism) to provide this information during a transform, you must set the attribute to true before generating the Transformer and processing the stylesheet.
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.xalan/XalanOutputProperties.properties b/bundles/org.eclipse.wst.xsl.xalan/XalanOutputProperties.properties
deleted file mode 100644
index 396d47b..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/XalanOutputProperties.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Doug Satchwell (Chase Technology Ltd) - initial API and implementation
-###############################################################################
-S_KEY_INDENT_AMOUNT={http://xml.apache.org/xslt}indent-amount
-S_KEY_INDENT_AMOUNT.DESC=The number of whitespaces to indent by, if indent="yes"
-
-S_KEY_ENTITIES={http://xml.apache.org/xslt}entities
-S_KEY_ENTITIES.DESC=File name of file that specifies character to entity reference mappings.
-
-S_USE_URL_ESCAPING={http://xml.apache.org/xslt}use-url-escaping
-S_USE_URL_ESCAPING.DESC=Use a value of "yes" if the href values for HTML serialization should use %xx escaping
-
-S_OMIT_META_TAG={http://xml.apache.org/xslt}omit-meta-tag
-S_OMIT_META_TAG.DESC=Use a value of "yes" if the META tag should be omitted where it would otherwise be supplied.
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.xalan/about.html b/bundles/org.eclipse.wst.xsl.xalan/about.html
deleted file mode 100644
index 73db36e..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/about.html
+++ /dev/null
@@ -1,34 +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">
-
-<H3>About This Content</H3>
-
-<P>June 06, 2007</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/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</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>
diff --git a/bundles/org.eclipse.wst.xsl.xalan/build.properties b/bundles/org.eclipse.wst.xsl.xalan/build.properties
deleted file mode 100644
index 175cb4f..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = META-INF/,\
-               plugin.xml,\
-               XalanOutputProperties.properties,\
-               XalanFeatures.properties,\
-               about.html,\
-               plugin.properties,\
-               xalan-debugger.jar
-jars.compile.order = xalan-debugger.jar
-source.xalan-debugger.jar = src-debugger/
-output.xalan-debugger.jar = bin/
diff --git a/bundles/org.eclipse.wst.xsl.xalan/plugin.properties b/bundles/org.eclipse.wst.xsl.xalan/plugin.properties
deleted file mode 100644
index 5d33629..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/plugin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.xalan
-Bundle-Name.0 = Xalan Plug-in (Incubating)
-processorType.label.0 = Xalan
-processor.label.0 = Xalan 2.5.1
-processor.label.1 = Xalan 2.7.1
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.xalan/plugin.xml b/bundles/org.eclipse.wst.xsl.xalan/plugin.xml
deleted file mode 100644
index d62924d..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/plugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.wst.xsl.launching.processorType">
-      <processorType
-            featureProperties="XalanFeatures.properties"
-            id="org.eclipse.wst.xsl.xalan.processorType"
-            label="%processorType.label.0"
-            outputProperties="XalanOutputProperties.properties"
-            transformerFactory="org.apache.xalan.processor.TransformerFactoryImpl">
-      </processorType>
-   </extension>
-   <extension
-         point="org.eclipse.wst.xsl.launching.debugger">
-      <debugger
-            className="org.eclipse.wst.xsl.xalan.debugger.XalanDebugger"
-            classpath="xalan-debugger.jar"
-            id="org.eclipse.wst.xsl.xalan.debugger"
-            name="Xalan 2.5.1 or greater"
-            processorTypeId="org.eclipse.wst.xsl.xalan.processorType">
-      </debugger>
-   </extension>
-   <extension
-         point="org.eclipse.wst.xsl.launching.processor">
-      <!-- An adopter can specify the ${eclipse_orbit: } variable to indicate which eclipse
-           bundle should be added to the class path. -->
-      <processor
-            classpath="${eclipse_orbit:org.apache.xalan};${eclipse_orbit:org.apache.xml.serializer}"
-            id="org.eclipse.wst.xsl.launching.xalan.processor"
-            label="%processor.label.1"
-            processorTypeId="org.eclipse.wst.xsl.xalan.processorType"
-            debuggerId="org.eclipse.wst.xsl.xalan.debugger"
-            supports="1.0">
-      </processor>
-   </extension>
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanDebugger.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanDebugger.java
deleted file mode 100644
index 3104db4..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanDebugger.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.xalan.debugger;
-
-import java.util.Map;
-import java.util.TooManyListenersException;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xalan.processor.TransformerFactoryImpl;
-import org.apache.xalan.trace.TraceManager;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.eclipse.wst.xsl.debugger.AbstractDebugger;
-import org.eclipse.wst.xsl.debugger.Variable;
-
-public class XalanDebugger extends AbstractDebugger
-{
-	private static final Log log = LogFactory.getLog(XalanDebugger.class);
-	private XalanTraceListener currentTraceListener;
-	
-	public void setTransformerFactory(TransformerFactory factory)
-	{
-		TransformerFactoryImpl tfi = (TransformerFactoryImpl) factory;
-		tfi.setAttribute(TransformerFactoryImpl.FEATURE_SOURCE_LOCATION, Boolean.TRUE);
-		tfi.setAttribute(TransformerFactoryImpl.FEATURE_OPTIMIZE, Boolean.FALSE);
-	}
-
-	public void addTransformer(Transformer transformer, Map locations)
-	{
-		TransformerImpl transformerImpl = (TransformerImpl) transformer;
-		TraceManager trMgr = transformerImpl.getTraceManager();
-		try
-		{
-//			XalanPrintTraceListener printer = new XalanPrintTraceListener(new PrintWriter(System.err));
-//			printer.m_traceElements = true;
-//			printer.m_traceSelection = true;
-//			printer.m_traceTemplates = true;
-//			trMgr.addTraceListener(printer);
-			
-			XalanTraceListener traceListener = new XalanTraceListener(this);
-			trMgr.addTraceListener(traceListener);
-		}
-		catch (TooManyListenersException e)
-		{
-			// ignore
-		}
-	}
-
-	public Variable getVariable(int id)
-	{
-		return currentTraceListener.getVariable(id);
-	}
-
-	void setCurrentTraceListener(XalanTraceListener currentTraceListener)
-	{
-		log.debug("Setting new XalanTraceListener");
-		this.currentTraceListener = currentTraceListener;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanPrintTraceListener.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanPrintTraceListener.java
deleted file mode 100644
index 3d6c07d..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanPrintTraceListener.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.xalan.debugger;
-
-import java.io.PrintWriter;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xalan.trace.EndSelectionEvent;
-import org.apache.xalan.trace.PrintTraceListener;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.trace.TracerEvent;
-
-public class XalanPrintTraceListener extends PrintTraceListener
-{
-	private final PrintWriter writer;
-
-	public XalanPrintTraceListener(PrintWriter pw)
-	{
-		super(pw);
-		this.writer = pw;
-	}
-
-	public void _trace(TracerEvent ev)
-	{
-		switch (ev.m_styleNode.getXSLToken())
-		{
-			case Constants.ELEMNAME_TEXTLITERALRESULT:
-				if (m_traceElements)
-				{
-					writer.print(ev.m_styleNode.getSystemId() + " Line #" + ev.m_styleNode.getLineNumber() + ", " + "Column #" + ev.m_styleNode.getColumnNumber() + " -- " + ev.m_styleNode.getNodeName()
-							+ ": ");
-
-					ElemTextLiteral etl = (ElemTextLiteral) ev.m_styleNode;
-					String chars = new String(etl.getChars(), 0, etl.getChars().length);
-
-					writer.println("    " + chars.trim());
-				}
-				break;
-			case Constants.ELEMNAME_TEMPLATE:
-				if (m_traceTemplates || m_traceElements)
-				{
-					ElemTemplate et = (ElemTemplate) ev.m_styleNode;
-
-					writer.print(et.getSystemId() + " Line #" + et.getLineNumber() + ", " + "Column #" + et.getColumnNumber() + ": " + et.getNodeName() + " ");
-
-					if (null != et.getMatch())
-					{
-						writer.print("match='" + et.getMatch().getPatternString() + "' ");
-					}
-
-					if (null != et.getName())
-					{
-						writer.print("name='" + et.getName() + "' ");
-					}
-
-					writer.println();
-				}
-				break;
-			default:
-				if (m_traceElements)
-				{
-					writer
-							.println(ev.m_styleNode.getSystemId() + " Line #" + ev.m_styleNode.getLineNumber() + ", " + "Column #" + ev.m_styleNode.getColumnNumber() + ": "
-									+ ev.m_styleNode.getNodeName());
-				}
-		}
-	}
-
-	public void selected(SelectionEvent ev) throws TransformerException
-	{
-		writer.print("selected: ");
-		super.selected(ev);
-	}
-	
-	public void selectEnd(EndSelectionEvent ev) throws TransformerException
-	{
-		writer.print("selectEnd: ");
-		super.selectEnd(ev);
-	}
-	
-	public void trace(TracerEvent ev)
-	{
-		writer.print("trace: ");
-		super.trace(ev);
-	}
-	
-	public void traceEnd(TracerEvent ev)
-	{
-		writer.print("traceEnd: ");
-		_trace(ev);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanRootStyleFrame.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanRootStyleFrame.java
deleted file mode 100644
index 3f464fb..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanRootStyleFrame.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.xalan.debugger;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xalan.templates.ElemVariable;
-import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xalan.trace.TracerEvent;
-import org.apache.xpath.VariableStack;
-import org.eclipse.wst.xsl.debugger.Variable;
-
-public class XalanRootStyleFrame extends XalanStyleFrame
-{
-	private static final Log log = LogFactory.getLog(XalanRootStyleFrame.class);
-	private Map variables;
-	private ArrayList globals;
-
-	public XalanRootStyleFrame(TracerEvent event)
-	{
-		super(null, event);
-		fillGlobals(event);
-	}
-
-	protected List getGlobals()
-	{
-		return globals;
-	}
-	
-	private void fillGlobals(TracerEvent event)
-	{
-		VariableStack vs = event.m_processor.getXPathContext().getVarStack();
-	    StylesheetRoot sr = event.m_styleNode.getStylesheetRoot();
-	    Vector vars = sr.getVariablesAndParamsComposed();
-		variables = new HashMap(vars.size());
-		globals = new ArrayList(vars.size());
-	    int i = vars.size();
-	    while (--i >= 0)
-		{
-			ElemVariable variable = (ElemVariable) vars.elementAt(i);
-			XalanVariable xvar = new XalanVariable(this,vs,Variable.GLOBAL_SCOPE,i,variable);
-			addVariable(xvar);
-			globals.add(xvar);
-		}
-	}
-
-	public Variable getVariable(int id)
-	{
-//		log.debug("Getting variable with id "+id+" from variables "+variables.size());
-		return (Variable)variables.get(new Integer(id));
-	}
-
-	public void addVariable(XalanVariable xvar)
-	{
-//		log.debug("Adding variable index="+xvar.getSlotNumber()+" val="+xvar);
-//		variables.add(xvar.getSlotNumber(),xvar);
-		log.debug("Adding variable id="+xvar.getId());
-		variables.put(new Integer(xvar.getId()),xvar);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanStyleFrame.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanStyleFrame.java
deleted file mode 100644
index 761ea98..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanStyleFrame.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.xalan.debugger;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import javax.xml.transform.SourceLocator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xalan.templates.ElemCallTemplate;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemVariable;
-import org.apache.xalan.trace.TracerEvent;
-import org.apache.xml.dtm.ref.DTMNodeProxy;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.XPath;
-import org.eclipse.wst.xsl.debugger.StyleFrame;
-import org.eclipse.wst.xsl.debugger.Variable;
-import org.w3c.dom.Node;
-
-public class XalanStyleFrame extends StyleFrame
-{
-	private static final Log log = LogFactory.getLog(XalanStyleFrame.class);
-
-	private final Map varNames;
-	private final Stack eventStack = new Stack();
-	final TracerEvent event;
-	private int currentLine;
-	private XalanRootStyleFrame rootStyleFrame;
-
-	public XalanStyleFrame(StyleFrame parent, TracerEvent event)
-	{
-		super(parent);
-		this.event = event;
-		if (parent != null)
-			this.varNames = new HashMap(((XalanStyleFrame) parent).varNames);
-		else
-			this.varNames = new HashMap();
-		pushElement(event);
-		findRootStyleFrame();
-	}
-
-	private void findRootStyleFrame()
-	{
-		XalanStyleFrame frame = this;
-		do
-		{
-			if (frame instanceof XalanRootStyleFrame)
-				rootStyleFrame = (XalanRootStyleFrame) frame;
-		}
-		while ((frame = (XalanStyleFrame) frame.getParent()) != null);
-	}
-
-	public String getFilename()
-	{
-		return event.m_styleNode.getStylesheet().getSystemId();
-	}
-
-	public String getName()
-	{
-		String name = event.m_styleNode.getNodeName();
-		if (event.m_styleNode instanceof ElemTemplate)
-		{
-			ElemTemplate et = (ElemTemplate) event.m_styleNode;
-			QName q = et.getName();
-			if (q != null)
-			{
-				name += " name=\"" + q.getLocalName() + "\"";
-			}
-			XPath xp = et.getMatch();
-			if (xp != null)
-			{
-				name += " match=\"" + xp.getPatternString() + "\"";
-			}
-		}
-		else if (event.m_styleNode instanceof ElemCallTemplate)
-		{
-			ElemCallTemplate et = (ElemCallTemplate) event.m_styleNode;
-			QName q = et.getName();
-			if (q != null)
-			{
-				name += " name=\"" + q.getLocalName() + "\"";
-			}
-		}
-		return name;
-	}
-
-	public List getVariableStack()
-	{
-		List vars = new ArrayList();
-		vars.addAll(getLocals());
-		vars.addAll(getGlobals());
-		return vars;
-	}
-
-	public int getCurrentLine()
-	{
-		return currentLine;
-	}
-
-	public void pushElement(TracerEvent e)
-	{
-		currentLine = e.m_styleNode.getLineNumber();
-		eventStack.push(e);
-		if (log.isDebugEnabled())
-			log.debug("Pushed element " + TracerEvent.printNode(e.m_styleNode) + " at line " + currentLine);
-	}
-
-	public TracerEvent popElement()
-	{
-		TracerEvent e = (TracerEvent) eventStack.pop();
-		currentLine = e.m_styleNode.getEndLineNumber();
-		if (log.isDebugEnabled())
-			log.debug("Popped element " + TracerEvent.printNode(e.m_styleNode) + " at line " + currentLine);
-
-		ElemTemplateElement element = e.m_styleNode;
-		String name = element.getNodeName();
-		log.debug(" name " + name);
-		if (name.equals("param") || name.equals("variable"))
-			addVariable((ElemVariable) e.m_styleNode);
-
-		return e;
-	}
-
-	public TracerEvent peekElement()
-	{
-		if (eventStack.isEmpty())
-			return null;
-		return (TracerEvent) eventStack.peek();
-	}
-
-	private void addVariable(ElemVariable variable)
-	{
-		String scope = variable.getIsTopLevel() ? Variable.GLOBAL_SCOPE : Variable.LOCAL_SCOPE;
-		VariableStack vs = event.m_processor.getXPathContext().getVarStack();
-		XalanVariable xvar = new XalanVariable(this, vs, scope, variable.getIndex(), variable);
-		rootStyleFrame.addVariable(xvar);
-		varNames.put(variable.getName(), xvar);
-	}
-
-	private List getLocals()
-	{
-		List locals = new ArrayList(varNames.values());
-		// sort by slotNumber
-		Collections.sort(locals);
-		return new ArrayList(varNames.values());
-	}
-
-	protected List getGlobals()
-	{
-		return rootStyleFrame.getGlobals();
-	}
-
-	public String getSourceFilename()
-	{
-		SourceLocator locator = getSourceLocator();
-		if (locator != null)
-			return locator.getSystemId();
-		return "";
-	}
-
-	public int getSourceCurrentLine()
-	{
-		SourceLocator locator = getSourceLocator();
-		if (locator != null)
-			return locator.getLineNumber();
-		return 0;
-	}
-	
-	private SourceLocator getSourceLocator()
-	{
-		Node sourceNode = event.m_sourceNode;
-        SourceLocator locator = null;
-		if (sourceNode instanceof DTMNodeProxy)
-		{
-			int nodeHandler = ((DTMNodeProxy) sourceNode).getDTMNodeNumber();
-			return ((DTMNodeProxy) sourceNode).getDTM().getSourceLocatorFor(nodeHandler);
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanTraceListener.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanTraceListener.java
deleted file mode 100644
index 8d3a446..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanTraceListener.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.xalan.debugger;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.trace.EndSelectionEvent;
-import org.apache.xalan.trace.ExtensionEvent;
-import org.apache.xalan.trace.GenerateEvent;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.trace.TraceListenerEx2;
-import org.apache.xalan.trace.TracerEvent;
-import org.eclipse.wst.xsl.debugger.BreakPoint;
-import org.eclipse.wst.xsl.debugger.Variable;
-
-public class XalanTraceListener implements TraceListenerEx2 //TraceListenerEx3
-{
-	private static final Log log = LogFactory.getLog(XalanTraceListener.class);
-
-	private final XalanDebugger debugger;
-	private XalanRootStyleFrame rootStyleFrame;
-	
-	public XalanTraceListener(XalanDebugger debugger)
-	{
-		this.debugger = debugger;
-	}
-
-	public void trace(TracerEvent ev)
-	{
-		XalanStyleFrame styleFrame = null;
-		if (rootStyleFrame == null)
-		{// this is the root of the stack
-			debugger.debuggerTransformStarted();
-			debugger.setCurrentTraceListener(this);
-			rootStyleFrame = new XalanRootStyleFrame(ev);
-			styleFrame = rootStyleFrame;
-			debugger.pushStyleFrame(styleFrame);
-		}
-		else if (ev.m_styleNode.getOwnerXSLTemplate() == ev.m_styleNode)
-		{// this is an xsl:template, so add to template stack
-			styleFrame = new XalanStyleFrame(debugger.peekStyleFrame(), ev);
-			debugger.pushStyleFrame(styleFrame);
-		}
-		else if (ev.m_styleNode.getXSLToken() != Constants.ELEMNAME_TEXTLITERALRESULT)
-		{// add to current template element stack
-			styleFrame = (XalanStyleFrame) debugger.peekStyleFrame();
-			styleFrame.pushElement(ev);
-		}
-		else
-		{
-			log.debug("Skipped push for element "+ev.m_styleNode.getLocalName());
-		}
-		check(styleFrame);
-	}
-
-	public void traceEnd(TracerEvent ev)
-	{
-		XalanStyleFrame styleFrame = (XalanStyleFrame) debugger.peekStyleFrame();
-		if (styleFrame!=null)
-		{
-			if (ev.m_styleNode.getOwnerXSLTemplate() == ev.m_styleNode)
-			{// remove from current template element stack
-				styleFrame.popElement();
-			}
-			else if (ev.m_styleNode.getXSLToken() != Constants.ELEMNAME_TEXTLITERALRESULT)
-			{// remove from current template element stack
-				styleFrame.popElement();
-			}
-			else
-			{
-				log.debug("Skipped pop for element "+ev.m_styleNode.getLocalName());
-			}
-			check(styleFrame);
-			if (ev.m_styleNode.getOwnerXSLTemplate() == ev.m_styleNode)
-			{// end of template, so remove from stack
-				debugger.popStyleFrame();
-			}
-			else
-			{// because we don't get selectEnd events, we need to do this check
-				TracerEvent tel = styleFrame.peekElement();
-				// if the parent is a choose, move on to it
-				switch (tel.m_styleNode.getXSLToken())
-				{
-					case Constants.ELEMNAME_CHOOSE:
-						styleFrame.popElement();
-						check(styleFrame);
-				}
-			}
-		}
-	}
-	
-	private void check(XalanStyleFrame styleFrame)
-	{
-		debugger.checkStopped();
-		if (styleFrame!=null)
-		{
-			// check breakpoint in stylesheet
-			BreakPoint breakpoint = new BreakPoint(styleFrame.getFilename(), styleFrame.getCurrentLine());
-			debugger.checkSuspended(styleFrame, breakpoint);
-			// TODO check breakpoint in source
-/*			breakpoint = new BreakPoint(styleFrame.getSourceFilename(), styleFrame.getSourceCurrentLine());
-			System.out.println("---------------"+breakpoint);
-			if (breakpoint.getFile() != null)
-				debugger.checkSuspended(styleFrame, breakpoint);
-*/		}
-	}
-
-	public void selected(SelectionEvent ev) throws TransformerException
-	{}
-
-	public void selectEnd(EndSelectionEvent ev) throws TransformerException
-	{}
-
-	public void generated(GenerateEvent ev)
-	{}
-
-	public void extension(ExtensionEvent ee)
-	{}
-
-	public void extensionEnd(ExtensionEvent ee)
-	{}
-
-	public Variable getVariable(int id)
-	{
-		return rootStyleFrame.getVariable(id);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanVariable.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanVariable.java
deleted file mode 100644
index 8367efb..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanVariable.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.xalan.debugger;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xalan.templates.ElemVariable;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
-import org.eclipse.wst.xsl.debugger.Variable;
-
-public class XalanVariable extends Variable implements Comparable
-{
-	private final Log log = LogFactory.getLog(XalanVariable.class);
-	private final ElemVariable elemVariable;
-	private final VariableStack varStack;
-	private int stackFrame;
-
-	public XalanVariable(XalanStyleFrame xalanStyleFrame, VariableStack varStack, String scope, int slotNumber, ElemVariable elemVariable)
-	{
-		super(getName(elemVariable,scope,xalanStyleFrame), scope, slotNumber+varStack.getStackFrame());
-		this.elemVariable = elemVariable;
-		this.varStack = varStack;
-		// get the stack frame at this current point in time
-		this.stackFrame = varStack.getStackFrame();
-	}
-
-	private static String getName(ElemVariable elemVariable, String scope, XalanStyleFrame xalanStyleFrame)
-	{
-		String name = elemVariable.getName().getLocalName();
-		String systemId = elemVariable.getStylesheet().getSystemId();
-		if (GLOBAL_SCOPE.equals(scope) && systemId != null)
-		{
-			int index;
-			if ((index = systemId.lastIndexOf('/')) > 0)
-				name += " (" + systemId.substring(index + 1) + ")";
-			else
-				name += " (" + systemId + ")";
-		}
-//		else if (LOCAL_SCOPE.equals(scope))
-//		{
-//			name += " (" + xalanStyleFrame.getName() + ")";
-//		}
-		return name;
-	}
-	
-	public String getType()
-	{
-		String value = UNKNOWN;
-		try
-		{
-			XObject xobject = getXObject();
-			if (xobject != null)
-			{
-				int xalanType = xobject.getType();
-				switch (xalanType)
-				{
-					case XObject.CLASS_UNRESOLVEDVARIABLE:
-						value = UNRESOLVED;
-						break;
-					case XObject.CLASS_NODESET:
-						value = NODESET;
-						break;
-					case XObject.CLASS_BOOLEAN:
-						value = BOOLEAN;
-						break;
-					case XObject.CLASS_NUMBER:
-						value = NUMBER;
-						break;
-					case XObject.CLASS_UNKNOWN:
-						value = UNKNOWN;
-						break;
-					case XObject.CLASS_STRING:
-					default:
-						value = STRING;
-						break;
-				}
-			}
-		}
-		catch (TransformerException e)
-		{
-			e.printStackTrace();
-		}
-		return value;
-	}
-
-	public String getValue()
-	{
-		String value = "???";
-		try
-		{
-			XObject xobject = getXObject();
-			if (xobject != null)
-			{
-				int xalanType = xobject.getType();
-				switch (xalanType)
-				{
-					case XObject.CLASS_UNRESOLVEDVARIABLE:
-						value = "";
-						break;
-					case XObject.CLASS_NODESET:
-						XNodeSet xns = (XNodeSet) xobject;
-						if (xns.nodelist().getLength() > 0)
-							value = ((XNodeSet) xobject).nodelist().item(0).toString();
-						else
-							value = "<EMPTY NODESET>";
-						break;
-					case XObject.CLASS_BOOLEAN:
-					case XObject.CLASS_NUMBER:
-					case XObject.CLASS_STRING:
-					case XObject.CLASS_UNKNOWN:
-					default:
-						value = xobject.toString();
-						break;
-				}
-			}
-		}
-		catch (TransformerException e)
-		{
-			e.printStackTrace();
-		}
-//		value = getScope()+"."+getSlotNumber()+")"+getName();	
-//		log.debug(getScope()+"."+getSlotNumber()+")"+getName() + "=" + value);
-		return value;
-	}
-
-	private XObject getXObject() throws TransformerException
-	{
-		XObject xvalue;
-		if (elemVariable.getIsTopLevel())
-			xvalue = varStack.elementAt(slotNumber);
-		else
-			xvalue = varStack.getLocalVariable(elemVariable.getIndex(), stackFrame);
-		return xvalue;
-	}
-
-	public int compareTo(Object arg0)
-	{
-		XalanVariable xvar = (XalanVariable)arg0;
-		int comp = xvar.stackFrame - stackFrame;
-		if (comp == 0)
-			comp = slotNumber - xvar.slotNumber;
-		return comp;
-	}
-}
diff --git a/docs/org.eclipse.wst.xsl.doc/.classpath b/docs/org.eclipse.wst.xsl.doc/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/docs/org.eclipse.wst.xsl.doc/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/docs/org.eclipse.wst.xsl.doc/.classpath.html b/docs/org.eclipse.wst.xsl.doc/.classpath.html
deleted file mode 100644
index 1e5486a..0000000
--- a/docs/org.eclipse.wst.xsl.doc/.classpath.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<span style="color: red">&lt;classpath&gt;
-	<span style="color: red">&lt;classpathentry&gt;&lt;/classpathentry&gt;</span>
-	<span style="color: red">&lt;classpathentry&gt;&lt;/classpathentry&gt;</span>
-	<span style="color: red">&lt;classpathentry&gt;&lt;/classpathentry&gt;</span>
-	<span style="color: red">&lt;classpathentry&gt;&lt;/classpathentry&gt;</span>
-&lt;/classpath&gt;</span>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/.cvsignore b/docs/org.eclipse.wst.xsl.doc/.cvsignore
deleted file mode 100644
index ba03f5d..0000000
--- a/docs/org.eclipse.wst.xsl.doc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xinclude
diff --git a/docs/org.eclipse.wst.xsl.doc/.project b/docs/org.eclipse.wst.xsl.doc/.project
deleted file mode 100644
index 164ae3e..0000000
--- a/docs/org.eclipse.wst.xsl.doc/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.doc</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/docs/org.eclipse.wst.xsl.doc/.project.html b/docs/org.eclipse.wst.xsl.doc/.project.html
deleted file mode 100644
index 8570001..0000000
--- a/docs/org.eclipse.wst.xsl.doc/.project.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<span style="color: red">&lt;projectDescription&gt;
-	<span style="color: red">&lt;name&gt;org.eclipse.wst.xsl.doc&lt;/name&gt;</span>
-	<em><span class="comment"></span></em>
-	<span style="color: red">&lt;projects&gt;
-	&lt;/projects&gt;</span>
-	<span style="color: red">&lt;buildSpec&gt;
-		<span style="color: red">&lt;buildCommand&gt;
-			<span style="color: red">&lt;name&gt;org.eclipse.jdt.core.javabuilder&lt;/name&gt;</span>
-			<span style="color: red">&lt;arguments&gt;
-			&lt;/arguments&gt;</span>
-		&lt;/buildCommand&gt;</span>
-		<span style="color: red">&lt;buildCommand&gt;
-			<span style="color: red">&lt;name&gt;org.eclipse.pde.ManifestBuilder&lt;/name&gt;</span>
-			<span style="color: red">&lt;arguments&gt;
-			&lt;/arguments&gt;</span>
-		&lt;/buildCommand&gt;</span>
-		<span style="color: red">&lt;buildCommand&gt;
-			<span style="color: red">&lt;name&gt;org.eclipse.pde.SchemaBuilder&lt;/name&gt;</span>
-			<span style="color: red">&lt;arguments&gt;
-			&lt;/arguments&gt;</span>
-		&lt;/buildCommand&gt;</span>
-	&lt;/buildSpec&gt;</span>
-	<span style="color: red">&lt;natures&gt;
-		<span style="color: red">&lt;nature&gt;org.eclipse.pde.PluginNature&lt;/nature&gt;</span>
-		<span style="color: red">&lt;nature&gt;org.eclipse.jdt.core.javanature&lt;/nature&gt;</span>
-	&lt;/natures&gt;</span>
-&lt;/projectDescription&gt;</span>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.xsl.doc/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f843f0f..0000000
--- a/docs/org.eclipse.wst.xsl.doc/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Mar 10 19:41:50 GMT-05:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/docs/org.eclipse.wst.xsl.doc/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xsl.doc/META-INF/MANIFEST.MF
deleted file mode 100644
index 532ec5f..0000000
--- a/docs/org.eclipse.wst.xsl.doc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Doc Plug-in
-Bundle-SymbolicName: org.eclipse.wst.xsl.doc; singleton:=true
-Bundle-Version: 0.5.0.qualifier
-Bundle-Activator: org.eclipse.wst.xsl.doc.Activator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Vendor: Eclipse
diff --git a/docs/org.eclipse.wst.xsl.doc/build.properties b/docs/org.eclipse.wst.xsl.doc/build.properties
deleted file mode 100644
index fc53675..0000000
--- a/docs/org.eclipse.wst.xsl.doc/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               html/,\
-               *.xml
diff --git a/docs/org.eclipse.wst.xsl.doc/build.xml b/docs/org.eclipse.wst.xsl.doc/build.xml
deleted file mode 100644
index c39f04f..0000000
--- a/docs/org.eclipse.wst.xsl.doc/build.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<project default="create-doc" basedir=".">
-
-	<property name="current-loc" location="." />
-	<property name="workspace" location=".." />
-	<property name="htmldir" value="${current-loc}/html" />
-	<property name="docbookdir" value="${workspace}/CommonUtilities/docbook-xsl/eclipse" />
-	<property name="docbooksource" value="${current-loc}/docbook"/>
-	<property name="xalan" value="org.apache.xalan.processor.TransformerFactoryImpl" />
-
-	<!-- XSLT Chunking Properties -->
-	<property name="base.dir" value="${htmldir}"/>
-	
-	<target name="merge">
-		<xsl.xinclude in="${docbooksource}/xslhelp.dbk" out="${docbooksource}/xslhelpcombined.dbk"/>
-	</target>
-
-	<target name="create-doc" depends="merge">
-
-		<xslt force="true" style="${docbookdir}/eclipse33.xsl" in="${docbooksource}/xslhelpcombined.dbk" out="test.xml">
-			<factory name="${xalan}" />
-			<param name="manifest" expression="1"/>
-			<param name="base.dir" expression="${htmldir}/"/>
-			<param name="create.plugin.xml" expression="0"/>
-			<param name="chunker.output.indent" expression="yes"/>
-			<param name="navig.showtitles" expression="0"/>
-			<param name="suppress.navigation" expression="1"/>
-            <param name="generate.toc" expression="book      toc,title,figure
-chapter   toc,title
-section   title" />
-		</xslt>
-		
-		<replace file="${current-loc}/toc.xml" token="${current-loc}/" value=""/>
-	</target>
-
-</project>
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/.cvsignore b/docs/org.eclipse.wst.xsl.doc/docbook/.cvsignore
deleted file mode 100644
index c0958b3..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xslhelpcombined.dbk
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/editor/editor.xml b/docs/org.eclipse.wst.xsl.doc/docbook/editor/editor.xml
deleted file mode 100644
index 6d6fc3d..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/editor/editor.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://www.docbook.org/xsd/4.5/docbook.xsd">
-	<?dbhtml filename="editor/xsleditor.html" ?>
-	<title>XSL Editing</title>
-	<para>
-      The XSL Tooling plugins extend the ability of the Web Standard Tools XML
-      editor.  This extension adds specific support and functionality for working
-      with and debugging XSL files. 
-    </para>
-    <section id="Validation">
-    	<?dbhtml filename="editor/xsleditor_validation.html" ?>
-    	<title>Validation</title>
-    	<para>
-    		The XSL extensions for the eclipse XML editor include as you type validation for XSL specific features.  This includes not
-    		only the ability to syntax check the grammar, but to also to validate specific XSL specification rules.  Grammar validation will
-    		be triggered based on the version attribute for the style sheet that is being edited.   Valid version numbers are 1.0, and 2.0.
-    		Currently XSLT 1.1 which was a transitional specification is not supported for editing.
-    	</para>
-    </section>
-	<section id="ContentAssist">
-		<?dbhtml filename="editor/xsleditor_contentassist.html" ?>
-		<title>Content Assist</title>
-		<para>
-		    XSL Tooling extends the existing content assistance support of the XML
-		    Editor to provide content assistance for several XSL namespace attributes.
-		    The content assistance provided covers the available XPath statements as
-		    defined in the <emphasis>XPath Templates</emphasis> preference page.
-		</para>
-		<para>
-			The elements and attributes that have content assist available are as follows:
-		</para>
-		<itemizedlist>
-			<listitem>
-				<para>
-				    <emphasis role="bold">template</emphasis> - The template element has several content assist
-				    options available for the <emphasis>match</emphasis>, <emphasis>name</emphasis>, and 
-				    <emphasis>mode</emphasis> attributes.
-				</para>
-				<para>
-					Add image showing template completion.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<emphasis role="bold">variable</emphasis> and <emphasis
-					role="bold">param</emphasis> - The variable and param elements have content assist
-					for xpath, axis, parmaters and variables that have already been predefined when using the optional
-					<emphasis>select</emphasis> attribute.
-				</para>
-				<para>
-					Add image showing variable completion.
-				</para>	
-			</listitem>
-			<listitem>
-				<para>
-					<emphasis role="bold">if</emphasis> and <emphasis role="bold">when</emphasis> - The
-					if and when elements have content assist for the <emphasis>test</emphasis> attribute.
-					This content assistance is available for all paramaters and variables that are in
-					scope, as well as any available xpath or axis statement.
-				</para>
-				<para>
-					Add image showing test completion.
-				</para>
-			</listitem>
-			<listitem>
-			    <para>
-			    	<emphasis role="bold">apply-template</emphasis> - The apply template has content
-			    	assistance for both the <emphasis>mode</emphasis> and <emphasis>select</emphasis>
-			    	attributes. 
-			    </para>
-				<para>
-					Add image showing apply-template completion.
-				</para>
-			</listitem>
-		</itemizedlist>
-		<important>
-			<title>XPath 2.0 Support</title>
-			<para>
-				Currently XPath 2.0 is not supported directly.  However, a user can add this support if they need it by
-				adding the missing XPath functions to the XPath Templates.
-			</para>
-		</important>
-	</section>
-	<section id="XSLEditorTemplates">
-		<?dbhtml filename="editor/xsleditor_templates.html" ?>
-		<title>Templates</title>
-		<para>
-			Specific XSL code completion templates can be added to the XML editor's Templates.   This allows a user
-			to define specific markup completion templates that are commonly used.   In addition, the XPath Templates page
-			can be enhanced to allow commonly used XPath templates to be included, in addition to those installed by default.
-			This allows a user the ability to add custom extension functions for XSLT that may be processor specific.  Adopters
-			may also use the standard template extension point to add additional functionality.
-		</para>
-		<section>
-			<?dbhtml filename="editor/xsleditor_xpathtemplates.html" ?>
-			<title>XPath Templates</title>
-			<para>
-				The XSL XPath Templates preference page allows for a user or adopter to add specific xpath extensions so that
-				they show up in the content assistance.   See the XPath Templates documentation for more information.
-			</para>
-		</section>
-	</section>
-	<section id="XSLEditorDebugging">
-	   <?dbhtml filename="editor/xsleditor_debugging.html" ?>
-		<title>XSL Debugging</title>
-		<para>
-			TODO: Add XSL Debugging documentation.
-		</para>
-	</section>
-</chapter>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/general/general.xml b/docs/org.eclipse.wst.xsl.doc/docbook/general/general.xml
deleted file mode 100644
index d98016b..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/general/general.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://www.docbook.org/xsd/4.5/docbook.xsd">
-	<?dbhtml filename="general/general.html" ?>
-	<title>General</title>
-	<para>This section covers topics that don't have any other particular place to go.</para>
-	<section id="XInclude">
-	    <?dbhtml filename="general/xinclude.html" ?>
-		<title>XInclude</title>
-		<para>
-      	XInclude allows a user to import or include other XML files into one xml file.
-        It is used primarily with documentation file formats like Docbook and DITA.  It
-        allows for separating out large xml documents into more manageable chunks of information.
-      </para>
-		<para>
-      	The XSL Tooling project includes an ANT task that can be run with in eclipse, eclipse
-      	headless, and without eclipse at all.   If running outside of eclipse, you will need
-      	to make sure that the jar file xinclude.jar in the org.eclipse.wst.xsl.core.jar file
-      	is made avaiable on your class path.
-      </para>
-		<mediaobject>
-			<objectinfo id="Xinclude">
-				<title>XInclude Task</title>
-			</objectinfo>
-			<imageobject>
-				<imagedata align="center" fileref="../images/general/xinclude.png"
-					format="PNG" />
-			</imageobject>
-		</mediaobject>
-		<para>
-      	The following parameters are available on the xsl.xinclude ANT task:
-      </para>
-		<itemizedlist>
-			<listitem>
-				<para>
-      			<emphasis role="bold">
-					in
-				</emphasis> - The full path to the input file that contains
-      			the file with the XIncludes.   If the files that it includes have includes, then
-      			those will be brought in an expanded as well.
-      		</para>
-			</listitem>
-			<listitem>
-				<para>
-					<emphasis role="bold">out</emphasis> - The full path to the output file 
-					to be written with all includes expanded.  This is typically used as the
-					input to a stylesheet transformation process.
-				</para>
-			</listitem>
-		</itemizedlist>
-	    <example>
-	    	<title>XInclude Example</title>
-	    	<programlisting xml:space="preserve">
-&lt;target name="merge">
-    &lt;xsl.xinclude in="${docbooksource}/xslhelp.dbk"
-                  out="${docbooksource}/xslhelpcombined.dbk"/>
-&lt;/target>	    		    	
-	    	</programlisting>
-	    </example>
-	</section>
-</chapter>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/XPathTemplates.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/XPathTemplates.png
deleted file mode 100644
index 0f89304..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/XPathTemplates.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xm_template_xslnewfile.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xm_template_xslnewfile.png
deleted file mode 100644
index 7646a6d..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xm_template_xslnewfile.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xsl_InstalledProcessors.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xsl_InstalledProcessors.png
deleted file mode 100644
index 3295079..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xsl_InstalledProcessors.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xsl_outputproperties.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xsl_outputproperties.png
deleted file mode 100644
index 4e00a42..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xsl_outputproperties.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xslfeatures.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xslfeatures.png
deleted file mode 100644
index 29dbec8..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xslfeatures.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xslpreferences.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xslpreferences.png
deleted file mode 100644
index dcb7187..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xslpreferences.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/launching/launching.xml b/docs/org.eclipse.wst.xsl.doc/docbook/launching/launching.xml
deleted file mode 100644
index 6df398f..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/launching/launching.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://www.docbook.org/xsd/4.5/docbook.xsd">
-	<?dbhtml filename="launching/launching.html" ?>
-	<title>XSL Launching and Debugging</title>
-	<para>
-		The XSL Tooling adds support for XSL Launch and Debugging configurations.
-		These allow you to setup XSL configurations for various jobs, and to also
-		debug xsl stylsheet transformations.	
-	</para>
-	<section id="XSLLaunch">
-		<?dbhtml filename="launching/xsllaunching.html" ?>
-		<title>XSL Launching</title>
-		<para>
-	       This is a place holder until some actual documentation can be written.
-	    </para>
-	</section>
-	<section id="XSLDebug">
-	    <?dbhtml filename="launching/debuglaunching.html" ?>
-		<title>Launch Debugging</title>
-		<para>
-	   		This is a place holder until some actual documentation can be written.
-	   </para>
-	</section>
-</chapter>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/preferences/preferences.xml b/docs/org.eclipse.wst.xsl.doc/docbook/preferences/preferences.xml
deleted file mode 100644
index c543e77..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/preferences/preferences.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="XSLPreferences" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://www.docbook.org/xsd/4.5/docbook.xsd">
-	<?dbhtml filename="preferences/xslpreferences.html" ?>
-	<title>XSL Tooling Preferences</title>
-	<para>
-		The XSL Preference pages has several sub sections.  Each of these allow for configuration
-		of various aspects of the preferences.   From the controlling of the default XSL processor
-		to be used during transformations.   To extending the content assist support of the XPath
-		functions available in the XML editor.
-   </para>
-	<mediaobject>
-		<imageobject>
-			<imagedata align="center" fileref="../images/preferences/xslpreferences.png"
-				format="PNG" />
-		</imageobject>
-	</mediaobject>
-	<section id="XSLFeatures">
-		<?dbhtml filename="preferences/xslfeatures.html" ?>
-		<title>Features</title>
-		<para>
-   			The XSL Features preference page allows for the configuration of features for a particular
-   			processor.   XSL Tooling comes with Xalan 2.7.0 by default.  Adopters can extend and include
-   			their own specific features for their own procesoors.   An adopter could extend the tooling
-   			to support XSLT 2.0 transformations, and features particular to that parser.
-   		</para>
-		<mediaobject>
-			<imageobject>
-				<imagedata align="center" format="PNG"
-					fileref="../images/preferences/xslfeatures.png" />
-			</imageobject>
-		</mediaobject>
-		<para>
-   			The <emphasis role="bold">Processor Type</emphasis> allows you to set features for a specific processor.  In this case
-   			this is for the processor that is being installed.   XSL Tooling comes with Xalan 2.7.0, and it is the only available
-   			processor type by default.
-   		</para>
-		<para>
-   		    The feature table lists the features that are specific to the processor that was selected.  As you
-   		    select each of the features, information regarding that feature and it's abilitis is displayed in the
-   		    description box.   By clicking in the value column, next to the feature you want to set the value
-   		    for, the user can set the feature.
-   		</para>
-	</section>
-	<section id="XSLProcessors">
-		<?dbhtml filename="preferences/xslprocessors.html" ?>
-		<title>Installed Processors</title>
-		<para>
-  			The installed processors page lets you pick which of the installed XSLT processors will be used
-  			by default.   The default is the System Default Procesoor, but you can select any of the
-  			available processors to be used as the default processor.    	
-      	</para>
-      	<mediaobject>
-      	   <imageobject>
-      	   		<imagedata align="center" fileref="../images/preferences/xsl_InstalledProcessors.png" format="PNG"/>
-      	   </imageobject>
-      	</mediaobject>
-	</section>
-	<section id="XSLOutputProperties">
-		<?dbhtml filename="preferences/xsloutputproperties.html" ?>
-		<title>Output Properties</title>
-		<para>
-			The various xsl processors support a wide variety of processor specific tweaks.  However there
-			are several Standard processor features that all XSLT processors support.   These options can be
-			set and will act as the defaults for all transformations unless they are specifically overriden by
-			the stylesheet or the launch configuration.
-		</para>
-		<mediaobject>
-		    <imageobject>
-		    	<imagedata align="center" fileref="../images/preferences/xsl_outputproperties.png" format="PNG"/>
-		    </imageobject>
-		</mediaobject>
-		<para>
-			In addition to the Standard Output Properties, each XSLT processor can have processors
-			specific features.
-		</para>
-	</section>
-	<section id="XPathTemplates">
-		<?dbhtml filename="preferences/xpathtemplates.html" ?>
-		<title>XPath Templates</title>
-		<para>
-		    XPath template proposal is supported by the XSL Tooling project through the
-		    built in template functionality of eclipse.   Users and Adopters can add
-		    their own specific xpath extensions for processor specific extensions.  An
-		    example would be to add the EXSLT extensions for proposal support.
-		</para>
-		<mediaobject>
-		    <imageobject>
-		        <objectinfo>
-		           <title>XPath Templates</title>
-		        </objectinfo>
-		    	<imagedata align="center" fileref="../images/preferences/XPathTemplates.png" format="PNG"/>
-		    </imageobject>
-		</mediaobject>
-		<para>
-		   The following content types are available:
-		</para>
-		<itemizedlist>
-			<listitem>
-				<para>
-					<emphasis role="bold">axis</emphasis> - an XPath navigation axis statement.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<emphasis role="bold">exslt</emphasis> - An XPath statement that is defined by
-					the <ulink url="http://www.exslt.org/">EXSLT</ulink> library.  Xalan and most
-					other processors have built in support for the EXSLT library.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<emphasis role="bold">xpath</emphasis> - Represents an XPATH 1.0 function.  These
-					are functions as defined by the XPath 1.0 specification.
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<emphasis role="bold">xpath 2.0</emphasis> - Represents an XPath 2.0 function.
-					<emphasis>Note: That currently XSL Tooling only ships with templates defined for XPath 1.0 .</emphasis>
-				</para>
-			</listitem>
-			<listitem>
-				<para>
-					<emphasis role="bold">operator</emphasis> - An xpath logical operator like AND, OR, etc.
-				</para>
-			</listitem>
-		</itemizedlist>
-		<section id="XPathTemplateNew">
-		   <?dbhtml filename="preferences/xpathtemplatenew.html" ?>
-		   <title>Creating New Templates</title>
-		   <!-- TODO: Create Additional information on creating new templates-->
-		   <para>
-		      Add documentation about creating new templates.
-		   </para>
-		</section>
-		<section id="XPathImport">
-		   <?dbhtml filename="preferences/xpathimport.html" ?>
-		   <title>Import XPath Templates</title>
-		   <para>
-		      Add documentation about importing new templates.
-		   </para>
-		</section>
-		<section id="XPathExport">
-		   <?dbhtml filename="preferences/xpathexport.html" ?>
-		   <title>Import XPath Templates</title>
-		   <para>
-		      Add documentation about importing new templates.
-		   </para>
-		</section>
-		
-	</section>
-	
-</chapter>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/samples/samples.xml b/docs/org.eclipse.wst.xsl.doc/docbook/samples/samples.xml
deleted file mode 100644
index 2c8106e..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/samples/samples.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<chapter xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://www.docbook.org/xsd/4.5/docbook.xsd"
-	xmlns:xi="http://www.w3.org/2001/XInclude">
-	<?dbhtml filename="samples/samples.html" ?>
-	<title>XSL Tooling Samples</title>
-	<para>This section contains several samples and references to sample projects.</para>
-	<section id="EclipseHelp">
-		<?dbhtml filename="samples/eclipsehelp.html" ?>
-		<title>Eclipse Help</title>
-		<para></para>
-		<section id="DocbookEclipseHelp">
-			<?dbhtml filename="samples/docbookhelp.html" ?>
-			<title>Creating Eclipse Help with Docbook and XSL Tooling</title>
-			<para>
-				This tutorial assumes that you have knowledge of Docbook, ANT, and the
-				ability to setup ANT build scripts.
-			</para>
-			<para>
-				To Do write up the rest of the tutorial.
-			</para>
-		</section>
-		<section id="DITAEclipseHelp">
-			<?dbhtml filename="samples/ditahelp.html" ?>
-			<title>Creating Eclipse Help with DITA and XSL Tooling</title>
-			<para>
-				This tutorial assumes that you have knowledge of DITA, ANT, and the
-				ability to setup ANT build scripts.
-			</para>
-			<para>
-				To Do write up the rest of the tutorial.
-			</para>
-		</section>
-	</section>
-</chapter>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/xslhelp.dbk b/docs/org.eclipse.wst.xsl.doc/docbook/xslhelp.dbk
deleted file mode 100644
index 5004cf5..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/xslhelp.dbk
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<book id="XSLUser" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.docbook.org/xsd/4.5/docbook.xsd"
-	  xmlns:xi="http://www.w3.org/2001/XInclude">
-  <bookinfo>
-      <title>XSL Tooling User Documentation</title>
-      <author>
-         <firstname>David</firstname>
-         <surname>Carver</surname>
-      </author>
-      <copyright>
-         <year>2008</year>
-         <holder>Eclipse Foundation and others</holder>
-      </copyright>
-   </bookinfo>
-   <xi:include href="general/general.xml"/>
-   <xi:include href="editor/editor.xml"/>
-   <xi:include href="launching/launching.xml"/>
-   <xi:include href="preferences/preferences.xml"/>
-   <xi:include href="samples/samples.xml"/>
-</book>
-
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor.html
deleted file mode 100644
index d67f818..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter&nbsp;2.&nbsp;XSL Editing</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="../index.html" title="XSL Tooling User Documentation"><link rel="prev" href="../general/general.html" title="Chapter&nbsp;1.&nbsp;General"><link rel="next" href="xsleditor_contentassist.html" title="Content Assist"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="N10047"></a>Chapter&nbsp;2.&nbsp;XSL Editing</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="xsleditor.html#Validation">Validation</a></span></dt><dt><span class="section"><a href="xsleditor_contentassist.html">Content Assist</a></span></dt><dt><span class="section"><a href="xsleditor_templates.html">Templates</a></span></dt><dd><dl><dt><span class="section"><a href="xsleditor_templates.html#N100B1">XPath Templates</a></span></dt></dl></dd><dt><span class="section"><a href="xsleditor_debugging.html">XSL Debugging</a></span></dt></dl></div><p>
-      The XSL Tooling plugins extend the ability of the Web Standard Tools XML
-      editor.  This extension adds specific support and functionality for working
-      with and debugging XSL files. 
-    </p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="Validation"></a>Validation</h2></div></div></div><p>
-    		The XSL extensions for the eclipse XML editor include as you type validation for XSL specific features.  This includes not
-    		only the ability to syntax check the grammar, but to also to validate specific XSL specification rules.  Grammar validation will
-    		be triggered based on the version attribute for the style sheet that is being edited.   Valid version numbers are 1.0, and 2.0.
-    		Currently XSLT 1.1 which was a transitional specification is not supported for editing.
-    	</p></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist.html
deleted file mode 100644
index 56e8888..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Content Assist</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="xsleditor.html" title="Chapter&nbsp;2.&nbsp;XSL Editing"><link rel="prev" href="xsleditor.html" title="Chapter&nbsp;2.&nbsp;XSL Editing"><link rel="next" href="xsleditor_templates.html" title="Templates"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ContentAssist"></a>Content Assist</h2></div></div></div><p>
-		    XSL Tooling extends the existing content assistance support of the XML
-		    Editor to provide content assistance for several XSL namespace attributes.
-		    The content assistance provided covers the available XPath statements as
-		    defined in the <span class="emphasis"><em>XPath Templates</em></span> preference page.
-		</p><p>
-			The elements and attributes that have content assist available are as follows:
-		</p><div class="itemizedlist"><ul type="disc"><li><p>
-				    <span class="bold"><strong>template</strong></span> - The template element has several content assist
-				    options available for the <span class="emphasis"><em>match</em></span>, <span class="emphasis"><em>name</em></span>, and 
-				    <span class="emphasis"><em>mode</em></span> attributes.
-				</p><p>
-					Add image showing template completion.
-				</p></li><li><p>
-					<span class="bold"><strong>variable</strong></span> and <span class="bold"><strong>param</strong></span> - The variable and param elements have content assist
-					for xpath, axis, parmaters and variables that have already been predefined when using the optional
-					<span class="emphasis"><em>select</em></span> attribute.
-				</p><p>
-					Add image showing variable completion.
-				</p></li><li><p>
-					<span class="bold"><strong>if</strong></span> and <span class="bold"><strong>when</strong></span> - The
-					if and when elements have content assist for the <span class="emphasis"><em>test</em></span> attribute.
-					This content assistance is available for all paramaters and variables that are in
-					scope, as well as any available xpath or axis statement.
-				</p><p>
-					Add image showing test completion.
-				</p></li><li><p>
-			    	<span class="bold"><strong>apply-template</strong></span> - The apply template has content
-			    	assistance for both the <span class="emphasis"><em>mode</em></span> and <span class="emphasis"><em>select</em></span>
-			    	attributes. 
-			    </p><p>
-					Add image showing apply-template completion.
-				</p></li></ul></div><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">XPath 2.0 Support</h3><p>
-				Currently XPath 2.0 is not supported directly.  However, a user can add this support if they need it by
-				adding the missing XPath functions to the XPath Templates.
-			</p></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_debugging.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_debugging.html
deleted file mode 100644
index 3e53bfb..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_debugging.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSL Debugging</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="xsleditor.html" title="Chapter&nbsp;2.&nbsp;XSL Editing"><link rel="prev" href="xsleditor_templates.html" title="Templates"><link rel="next" href="../launching/launching.html" title="Chapter&nbsp;3.&nbsp;XSL Launching and Debugging"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="XSLEditorDebugging"></a>XSL Debugging</h2></div></div></div><p>
-			TODO: Add XSL Debugging documentation.
-		</p></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_templates.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_templates.html
deleted file mode 100644
index 0ae9486..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_templates.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Templates</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="xsleditor.html" title="Chapter&nbsp;2.&nbsp;XSL Editing"><link rel="prev" href="xsleditor_contentassist.html" title="Content Assist"><link rel="next" href="xsleditor_debugging.html" title="XSL Debugging"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="XSLEditorTemplates"></a>Templates</h2></div></div></div><p>
-			Specific XSL code completion templates can be added to the XML editor's Templates.   This allows a user
-			to define specific markup completion templates that are commonly used.   In addition, the XPath Templates page
-			can be enhanced to allow commonly used XPath templates to be included, in addition to those installed by default.
-			This allows a user the ability to add custom extension functions for XSLT that may be processor specific.  Adopters
-			may also use the standard template extension point to add additional functionality.
-		</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="N100B1"></a>XPath Templates</h3></div></div></div><p>
-				The XSL XPath Templates preference page allows for a user or adopter to add specific xpath extensions so that
-				they show up in the content assistance.   See the XPath Templates documentation for more information.
-			</p></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_validation.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_validation.html
deleted file mode 100644
index d6df8e3..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_validation.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Content Assist</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="xsleditor.html" title="Chapter&nbsp;2.&nbsp;XSL Editing"><link rel="prev" href="xsleditor.html" title="Chapter&nbsp;2.&nbsp;XSL Editing"><link rel="next" href="xsleditor_templates.html" title="Templates"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="N10056"></a>Content Assist</h2></div></div></div><p>
-		    XSL Tooling extends the existing content assistance support of the XML
-		    Editor to provide content assistance for several XSL namespace attributes.
-		    The content assistance provided covers the available XPath statements as
-		    defined in the <span class="emphasis"><em>XPath Templates</em></span> preference page.
-		</p><p>
-			The elements and attributes that have content assist available are as follows:
-		</p><div class="itemizedlist"><ul type="disc"><li><p>
-				    <span class="bold"><strong>template</strong></span> - The template element has several content assist
-				    options available for the <span class="emphasis"><em>match</em></span>, <span class="emphasis"><em>name</em></span>, and 
-				    <span class="emphasis"><em>mode</em></span> attributes.
-				</p><p>
-					Add image showing template completion.
-				</p></li><li><p>
-					<span class="bold"><strong>variable</strong></span> and <span class="bold"><strong>param</strong></span> - The variable and param elements have content assist
-					for xpath, axis, parmaters and variables that have already been predefined when using the optional
-					<span class="emphasis"><em>select</em></span> attribute.
-				</p><p>
-					Add image showing variable completion.
-				</p></li><li><p>
-					<span class="bold"><strong>if</strong></span> and <span class="bold"><strong>when</strong></span> - The
-					if and when elements have content assist for the <span class="emphasis"><em>test</em></span> attribute.
-					This content assistance is available for all paramaters and variables that are in
-					scope, as well as any available xpath or axis statement.
-				</p><p>
-					Add image showing test completion.
-				</p></li><li><p>
-			    	<span class="bold"><strong>apply-template</strong></span> - The apply template has content
-			    	assistance for both the <span class="emphasis"><em>mode</em></span> and <span class="emphasis"><em>select</em></span>
-			    	attributes. 
-			    </p><p>
-					Add image showing apply-template completion.
-				</p></li></ul></div><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">XPath 2.0 Support</h3><p>
-				Currently XPath 2.0 is not supported directly.  However, a user can add this support if they need it by
-				adding the missing XPath functions to the XPath Templates.
-			</p></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/general/general.html b/docs/org.eclipse.wst.xsl.doc/html/general/general.html
deleted file mode 100644
index 1c7a015..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/general/general.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter&nbsp;1.&nbsp;General</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="../index.html" title="XSL Tooling User Documentation"><link rel="prev" href="../index.html" title="XSL Tooling User Documentation"><link rel="next" href="../editor/xsleditor.html" title="Chapter&nbsp;2.&nbsp;XSL Editing"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="N10014"></a>Chapter&nbsp;1.&nbsp;General</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="general.html#XInclude">XInclude</a></span></dt></dl></div><p>This section covers topics that don't have any other particular place to go.</p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="XInclude"></a>XInclude</h2></div></div></div><p>
-      	XInclude allows a user to import or include other XML files into one xml file.
-        It is used primarily with documentation file formats like Docbook and DITA.  It
-        allows for separating out large xml documents into more manageable chunks of information.
-      </p><p>
-      	The XSL Tooling project includes an ANT task that can be run with in eclipse, eclipse
-      	headless, and without eclipse at all.   If running outside of eclipse, you will need
-      	to make sure that the jar file xinclude.jar in the org.eclipse.wst.xsl.core.jar file
-      	is made avaiable on your class path.
-      </p><div class="mediaobject" align="center"><img src="../images/general/xinclude.png" align="middle"></div><p>
-      	The following parameters are available on the xsl.xinclude ANT task:
-      </p><div class="itemizedlist"><ul type="disc"><li><p>
-      			<span class="bold"><strong>
-					in
-				</strong></span> - The full path to the input file that contains
-      			the file with the XIncludes.   If the files that it includes have includes, then
-      			those will be brought in an expanded as well.
-      		</p></li><li><p>
-					<span class="bold"><strong>out</strong></span> - The full path to the output file 
-					to be written with all includes expanded.  This is typically used as the
-					input to a stylesheet transformation process.
-				</p></li></ul></div><div class="example"><a name="N10041"></a><p class="title"><b>Example&nbsp;1.1.&nbsp;XInclude Example</b></p><div class="example-contents"><pre class="programlisting">
-&lt;target name="merge"&gt;
-    &lt;xsl.xinclude in="${docbooksource}/xslhelp.dbk"
-                  out="${docbooksource}/xslhelpcombined.dbk"/&gt;
-&lt;/target&gt;	    		    	
-	    	</pre></div></div><br class="example-break"></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/general/xinclude.png b/docs/org.eclipse.wst.xsl.doc/html/images/general/xinclude.png
deleted file mode 100644
index 50b9f73..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/general/xinclude.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/XPathTemplates.png b/docs/org.eclipse.wst.xsl.doc/html/images/preferences/XPathTemplates.png
deleted file mode 100644
index 0f89304..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/XPathTemplates.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xm_template_xslnewfile.png b/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xm_template_xslnewfile.png
deleted file mode 100644
index 7646a6d..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xm_template_xslnewfile.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xsl_InstalledProcessors.png b/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xsl_InstalledProcessors.png
deleted file mode 100644
index 3295079..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xsl_InstalledProcessors.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xsl_outputproperties.png b/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xsl_outputproperties.png
deleted file mode 100644
index 4e00a42..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xsl_outputproperties.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xslfeatures.png b/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xslfeatures.png
deleted file mode 100644
index 29dbec8..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xslfeatures.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xslpreferences.png b/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xslpreferences.png
deleted file mode 100644
index dcb7187..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xslpreferences.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/index.html b/docs/org.eclipse.wst.xsl.doc/html/index.html
deleted file mode 100644
index 062ee15..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSL Tooling User Documentation</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="index.html" title="XSL Tooling User Documentation"><link rel="next" href="general/general.html" title="Chapter&nbsp;1.&nbsp;General"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="XSLUser"></a>XSL Tooling User Documentation</h1></div><div><div class="author"><h3 class="author"><span class="firstname">David</span> <span class="surname">Carver</span></h3></div></div><div><p class="copyright">Copyright &copy; 2008 Eclipse Foundation and others</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="general/general.html">1. General</a></span></dt><dd><dl><dt><span class="section"><a href="general/general.html#XInclude">XInclude</a></span></dt></dl></dd><dt><span class="chapter"><a href="editor/xsleditor.html">2. XSL Editing</a></span></dt><dd><dl><dt><span class="section"><a href="editor/xsleditor.html#Validation">Validation</a></span></dt><dt><span class="section"><a href="editor/xsleditor_contentassist.html">Content Assist</a></span></dt><dt><span class="section"><a href="editor/xsleditor_templates.html">Templates</a></span></dt><dd><dl><dt><span class="section"><a href="editor/xsleditor_templates.html#N100B1">XPath Templates</a></span></dt></dl></dd><dt><span class="section"><a href="editor/xsleditor_debugging.html">XSL Debugging</a></span></dt></dl></dd><dt><span class="chapter"><a href="launching/launching.html">3. XSL Launching and Debugging</a></span></dt><dd><dl><dt><span class="section"><a href="launching/launching.html#XSLLaunch">XSL Launching</a></span></dt><dt><span class="section"><a href="launching/debuglaunching.html">Launch Debugging</a></span></dt></dl></dd><dt><span class="chapter"><a href="preferences/xslpreferences.html">4. XSL Tooling Preferences</a></span></dt><dd><dl><dt><span class="section"><a href="preferences/xslpreferences.html#XSLFeatures">Features</a></span></dt><dt><span class="section"><a href="preferences/xslprocessors.html">Installed Processors</a></span></dt><dt><span class="section"><a href="preferences/xsloutputproperties.html">Output Properties</a></span></dt><dt><span class="section"><a href="preferences/xpathtemplates.html">XPath Templates</a></span></dt><dd><dl><dt><span class="section"><a href="preferences/xpathtemplates.html#XPathTemplateNew">Creating New Templates</a></span></dt><dt><span class="section"><a href="preferences/xpathtemplates.html#XPathImport">Import XPath Templates</a></span></dt><dt><span class="section"><a href="preferences/xpathtemplates.html#XPathExport">Import XPath Templates</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="samples/samples.html">5. XSL Tooling Samples</a></span></dt><dd><dl><dt><span class="section"><a href="samples/samples.html#EclipseHelp">Eclipse Help</a></span></dt><dd><dl><dt><span class="section"><a href="samples/samples.html#DocbookEclipseHelp">Creating Eclipse Help with Docbook and XSL Tooling</a></span></dt><dt><span class="section"><a href="samples/samples.html#DITAEclipseHelp">Creating Eclipse Help with DITA and XSL Tooling</a></span></dt></dl></dd></dl></dd></dl></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/launching/debuglaunching.html b/docs/org.eclipse.wst.xsl.doc/html/launching/debuglaunching.html
deleted file mode 100644
index 6ffdfb8..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/launching/debuglaunching.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Launch Debugging</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="launching.html" title="Chapter&nbsp;3.&nbsp;XSL Launching and Debugging"><link rel="prev" href="launching.html" title="Chapter&nbsp;3.&nbsp;XSL Launching and Debugging"><link rel="next" href="../preferences/xslpreferences.html" title="Chapter&nbsp;4.&nbsp;XSL Tooling Preferences"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="XSLDebug"></a>Launch Debugging</h2></div></div></div><p>
-	   		This is a place holder until some actual documentation can be written.
-	   </p></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/launching/launching.html b/docs/org.eclipse.wst.xsl.doc/html/launching/launching.html
deleted file mode 100644
index 6a2ce1d..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/launching/launching.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter&nbsp;3.&nbsp;XSL Launching and Debugging</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="../index.html" title="XSL Tooling User Documentation"><link rel="prev" href="../editor/xsleditor_debugging.html" title="XSL Debugging"><link rel="next" href="debuglaunching.html" title="Launch Debugging"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="N100BE"></a>Chapter&nbsp;3.&nbsp;XSL Launching and Debugging</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="launching.html#XSLLaunch">XSL Launching</a></span></dt><dt><span class="section"><a href="debuglaunching.html">Launch Debugging</a></span></dt></dl></div><p>
-		The XSL Tooling adds support for XSL Launch and Debugging configurations.
-		These allow you to setup XSL configurations for various jobs, and to also
-		debug xsl stylsheet transformations.	
-	</p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="XSLLaunch"></a>XSL Launching</h2></div></div></div><p>
-	       This is a place holder until some actual documentation can be written.
-	    </p></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/preferences/xpathtemplates.html b/docs/org.eclipse.wst.xsl.doc/html/preferences/xpathtemplates.html
deleted file mode 100644
index 6302af6..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/xpathtemplates.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XPath Templates</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="xslpreferences.html" title="Chapter&nbsp;4.&nbsp;XSL Tooling Preferences"><link rel="prev" href="xsloutputproperties.html" title="Output Properties"><link rel="next" href="../samples/samples.html" title="Chapter&nbsp;5.&nbsp;XSL Tooling Samples"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="XPathTemplates"></a>XPath Templates</h2></div></div></div><p>
-		    XPath template proposal is supported by the XSL Tooling project through the
-		    built in template functionality of eclipse.   Users and Adopters can add
-		    their own specific xpath extensions for processor specific extensions.  An
-		    example would be to add the EXSLT extensions for proposal support.
-		</p><div class="mediaobject" align="center"><img src="../images/preferences/XPathTemplates.png" align="middle"></div><p>
-		   The following content types are available:
-		</p><div class="itemizedlist"><ul type="disc"><li><p>
-					<span class="bold"><strong>axis</strong></span> - an XPath navigation axis statement.
-				</p></li><li><p>
-					<span class="bold"><strong>exslt</strong></span> - An XPath statement that is defined by
-					the <a class="ulink" href="http://www.exslt.org/" target="_top">EXSLT</a> library.  Xalan and most
-					other processors have built in support for the EXSLT library.
-				</p></li><li><p>
-					<span class="bold"><strong>xpath</strong></span> - Represents an XPATH 1.0 function.  These
-					are functions as defined by the XPath 1.0 specification.
-				</p></li><li><p>
-					<span class="bold"><strong>xpath 2.0</strong></span> - Represents an XPath 2.0 function.
-					<span class="emphasis"><em>Note: That currently XSL Tooling only ships with templates defined for XPath 1.0 .</em></span>
-				</p></li><li><p>
-					<span class="bold"><strong>operator</strong></span> - An xpath logical operator like AND, OR, etc.
-				</p></li></ul></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="XPathTemplateNew"></a>Creating New Templates</h3></div></div></div><p>
-		      Add documentation about creating new templates.
-		   </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="XPathImport"></a>Import XPath Templates</h3></div></div></div><p>
-		      Add documentation about importing new templates.
-		   </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="XPathExport"></a>Import XPath Templates</h3></div></div></div><p>
-		      Add documentation about importing new templates.
-		   </p></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/preferences/xsloutputproperties.html b/docs/org.eclipse.wst.xsl.doc/html/preferences/xsloutputproperties.html
deleted file mode 100644
index 11f0a60..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/xsloutputproperties.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Output Properties</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="xslpreferences.html" title="Chapter&nbsp;4.&nbsp;XSL Tooling Preferences"><link rel="prev" href="xslprocessors.html" title="Installed Processors"><link rel="next" href="xpathtemplates.html" title="XPath Templates"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="XSLOutputProperties"></a>Output Properties</h2></div></div></div><p>
-			The various xsl processors support a wide variety of processor specific tweaks.  However there
-			are several Standard processor features that all XSLT processors support.   These options can be
-			set and will act as the defaults for all transformations unless they are specifically overriden by
-			the stylesheet or the launch configuration.
-		</p><div class="mediaobject" align="center"><img src="../images/preferences/xsl_outputproperties.png" align="middle"></div><p>
-			In addition to the Standard Output Properties, each XSLT processor can have processors
-			specific features.
-		</p></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/preferences/xslpreferences.html b/docs/org.eclipse.wst.xsl.doc/html/preferences/xslpreferences.html
deleted file mode 100644
index bfeb36a..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/xslpreferences.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter&nbsp;4.&nbsp;XSL Tooling Preferences</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="../index.html" title="XSL Tooling User Documentation"><link rel="prev" href="../launching/debuglaunching.html" title="Launch Debugging"><link rel="next" href="xslprocessors.html" title="Installed Processors"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="XSLPreferences"></a>Chapter&nbsp;4.&nbsp;XSL Tooling Preferences</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="xslpreferences.html#XSLFeatures">Features</a></span></dt><dt><span class="section"><a href="xslprocessors.html">Installed Processors</a></span></dt><dt><span class="section"><a href="xsloutputproperties.html">Output Properties</a></span></dt><dt><span class="section"><a href="xpathtemplates.html">XPath Templates</a></span></dt><dd><dl><dt><span class="section"><a href="xpathtemplates.html#XPathTemplateNew">Creating New Templates</a></span></dt><dt><span class="section"><a href="xpathtemplates.html#XPathImport">Import XPath Templates</a></span></dt><dt><span class="section"><a href="xpathtemplates.html#XPathExport">Import XPath Templates</a></span></dt></dl></dd></dl></div><p>
-		The XSL Preference pages has several sub sections.  Each of these allow for configuration
-		of various aspects of the preferences.   From the controlling of the default XSL processor
-		to be used during transformations.   To extending the content assist support of the XPath
-		functions available in the XML editor.
-   </p><div class="mediaobject" align="center"><img src="../images/preferences/xslpreferences.png" align="middle"></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="XSLFeatures"></a>Features</h2></div></div></div><p>
-   			The XSL Features preference page allows for the configuration of features for a particular
-   			processor.   XSL Tooling comes with Xalan 2.7.0 by default.  Adopters can extend and include
-   			their own specific features for their own procesoors.   An adopter could extend the tooling
-   			to support XSLT 2.0 transformations, and features particular to that parser.
-   		</p><div class="mediaobject" align="center"><img src="../images/preferences/xslfeatures.png" align="middle"></div><p>
-   			The <span class="bold"><strong>Processor Type</strong></span> allows you to set features for a specific processor.  In this case
-   			this is for the processor that is being installed.   XSL Tooling comes with Xalan 2.7.0, and it is the only available
-   			processor type by default.
-   		</p><p>
-   		    The feature table lists the features that are specific to the processor that was selected.  As you
-   		    select each of the features, information regarding that feature and it's abilitis is displayed in the
-   		    description box.   By clicking in the value column, next to the feature you want to set the value
-   		    for, the user can set the feature.
-   		</p></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/preferences/xslprocessors.html b/docs/org.eclipse.wst.xsl.doc/html/preferences/xslprocessors.html
deleted file mode 100644
index e3f5404..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/xslprocessors.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Installed Processors</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="xslpreferences.html" title="Chapter&nbsp;4.&nbsp;XSL Tooling Preferences"><link rel="prev" href="xslpreferences.html" title="Chapter&nbsp;4.&nbsp;XSL Tooling Preferences"><link rel="next" href="xsloutputproperties.html" title="Output Properties"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="XSLProcessors"></a>Installed Processors</h2></div></div></div><p>
-  			The installed processors page lets you pick which of the installed XSLT processors will be used
-  			by default.   The default is the System Default Procesoor, but you can select any of the
-  			available processors to be used as the default processor.    	
-      	</p><div class="mediaobject" align="center"><img src="../images/preferences/xsl_InstalledProcessors.png" align="middle"></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/reference/maintopic.html b/docs/org.eclipse.wst.xsl.doc/html/reference/maintopic.html
deleted file mode 100644
index a476078..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/reference/maintopic.html
+++ /dev/null
@@ -1,13 +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>Main Topic</title>
-</head>
-
-<body>
-<h1>Main Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/reference/subtopic.html b/docs/org.eclipse.wst.xsl.doc/html/reference/subtopic.html
deleted file mode 100644
index 8a61c50..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/reference/subtopic.html
+++ /dev/null
@@ -1,13 +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>Sub Topic</title>
-</head>
-
-<body>
-<h1>Sub Topic</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/reference/subtopic2.html b/docs/org.eclipse.wst.xsl.doc/html/reference/subtopic2.html
deleted file mode 100644
index 86bcbf9..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/reference/subtopic2.html
+++ /dev/null
@@ -1,13 +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>Sub Topic 2</title>
-</head>
-
-<body>
-<h1>Sub Topic 2</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/samples/samples.html b/docs/org.eclipse.wst.xsl.doc/html/samples/samples.html
deleted file mode 100644
index d15604d..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/samples/samples.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter&nbsp;5.&nbsp;XSL Tooling Samples</title><meta content="DocBook XSL Stylesheets V1.73.2" name="generator"><link rel="start" href="../index.html" title="XSL Tooling User Documentation"><link rel="up" href="../index.html" title="XSL Tooling User Documentation"><link rel="prev" href="../preferences/xpathtemplates.html" title="XPath Templates"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="N10169"></a>Chapter&nbsp;5.&nbsp;XSL Tooling Samples</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="samples.html#EclipseHelp">Eclipse Help</a></span></dt><dd><dl><dt><span class="section"><a href="samples.html#DocbookEclipseHelp">Creating Eclipse Help with Docbook and XSL Tooling</a></span></dt><dt><span class="section"><a href="samples.html#DITAEclipseHelp">Creating Eclipse Help with DITA and XSL Tooling</a></span></dt></dl></dd></dl></div><p>This section contains several samples and references to sample projects.</p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="EclipseHelp"></a>Eclipse Help</h2></div></div></div><p></p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="DocbookEclipseHelp"></a>Creating Eclipse Help with Docbook and XSL Tooling</h3></div></div></div><p>
-				This tutorial assumes that you have knowledge of Docbook, ANT, and the
-				ability to setup ANT build scripts.
-			</p><p>
-				To Do write up the rest of the tutorial.
-			</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="DITAEclipseHelp"></a>Creating Eclipse Help with DITA and XSL Tooling</h3></div></div></div><p>
-				This tutorial assumes that you have knowledge of DITA, ANT, and the
-				ability to setup ANT build scripts.
-			</p><p>
-				To Do write up the rest of the tutorial.
-			</p></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/plugin.xml b/docs/org.eclipse.wst.xsl.doc/plugin.xml
deleted file mode 100644
index 7f5a61e..0000000
--- a/docs/org.eclipse.wst.xsl.doc/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<plugin>
-	<extension point="org.eclipse.help.toc">
-		<toc primary="true" file="toc.xml"></toc>
-	</extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/src/org/eclipse/wst/xsl/doc/Activator.java b/docs/org.eclipse.wst.xsl.doc/src/org/eclipse/wst/xsl/doc/Activator.java
deleted file mode 100644
index 56d4d33..0000000
--- a/docs/org.eclipse.wst.xsl.doc/src/org/eclipse/wst/xsl/doc/Activator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.wst.xsl.doc;
-
-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.wst.xsl.doc";
-
-	// 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/docs/org.eclipse.wst.xsl.doc/test.xml b/docs/org.eclipse.wst.xsl.doc/test.xml
deleted file mode 100644
index e69de29..0000000
--- a/docs/org.eclipse.wst.xsl.doc/test.xml
+++ /dev/null
diff --git a/docs/org.eclipse.wst.xsl.doc/toc.xml b/docs/org.eclipse.wst.xsl.doc/toc.xml
deleted file mode 100644
index 198ba3e..0000000
--- a/docs/org.eclipse.wst.xsl.doc/toc.xml
+++ /dev/null
@@ -1 +0,0 @@
-<toc topic="html/index.html" label="XSL Tooling User Documentation"><topic href="html/general/general.html" label="General"><topic href="html/general/general.html#XInclude" label="XInclude"></topic></topic><topic href="html/editor/xsleditor.html" label="XSL Editing"><topic href="html/editor/xsleditor.html#Validation" label="Validation"></topic><topic href="html/editor/xsleditor_contentassist.html" label="Content Assist"></topic><topic href="html/editor/xsleditor_templates.html" label="Templates"><topic href="html/editor/xsleditor_templates.html#N100B1" label="XPath Templates"></topic></topic><topic href="html/editor/xsleditor_debugging.html" label="XSL Debugging"></topic></topic><topic href="html/launching/launching.html" label="XSL Launching and Debugging"><topic href="html/launching/launching.html#XSLLaunch" label="XSL Launching"></topic><topic href="html/launching/debuglaunching.html" label="Launch Debugging"></topic></topic><topic href="html/preferences/xslpreferences.html" label="XSL Tooling Preferences"><topic href="html/preferences/xslpreferences.html#XSLFeatures" label="Features"></topic><topic href="html/preferences/xslprocessors.html" label="Installed Processors"></topic><topic href="html/preferences/xsloutputproperties.html" label="Output Properties"></topic><topic href="html/preferences/xpathtemplates.html" label="XPath Templates"><topic href="html/preferences/xpathtemplates.html#XPathTemplateNew" label="Creating New Templates"></topic><topic href="html/preferences/xpathtemplates.html#XPathImport" label="Import XPath Templates"></topic><topic href="html/preferences/xpathtemplates.html#XPathExport" label="Import XPath Templates"></topic></topic></topic><topic href="html/samples/samples.html" label="XSL Tooling Samples"><topic href="html/samples/samples.html#EclipseHelp" label="Eclipse Help"><topic href="html/samples/samples.html#DocbookEclipseHelp" label="Creating Eclipse Help with Docbook and XSL Tooling"></topic><topic href="html/samples/samples.html#DITAEclipseHelp" label="Creating Eclipse Help with DITA and XSL Tooling"></topic></topic></topic></toc>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xsl_sdk.feature/.project b/features/org.eclipse.wst.xsl_sdk.feature/.project
deleted file mode 100644
index da554e4..0000000
--- a/features/org.eclipse.wst.xsl_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xsl_sdk.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.wst.xsl_sdk.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 3750df1..0000000
--- a/features/org.eclipse.wst.xsl_sdk.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Dec 16 16:57:57 EST 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/features/org.eclipse.wst.xsl_sdk.feature/.settings/org.eclipse.pde.prefs b/features/org.eclipse.wst.xsl_sdk.feature/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fdd8568..0000000
--- a/features/org.eclipse.wst.xsl_sdk.feature/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Fri Jan 04 09:04:43 EST 2008
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.missing-bundle-classpath-entries=0
-compilers.p.missing-packages=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=1
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/features/org.eclipse.wst.xsl_sdk.feature/build.properties b/features/org.eclipse.wst.xsl_sdk.feature/build.properties
deleted file mode 100644
index a03cb76..0000000
--- a/features/org.eclipse.wst.xsl_sdk.feature/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties
-
-generate.feature@org.eclipse.wst.xsl.feature.source=org.eclipse.wst.xsl.feature
diff --git a/features/org.eclipse.wst.xsl_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xsl_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xsl_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xsl_sdk.feature/epl-v10.html b/features/org.eclipse.wst.xsl_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xsl_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xsl_sdk.feature/feature.properties b/features/org.eclipse.wst.xsl_sdk.feature/feature.properties
deleted file mode 100644
index 7dbbb37..0000000
--- a/features/org.eclipse.wst.xsl_sdk.feature/feature.properties
+++ /dev/null
@@ -1,145 +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
-###############################################################################
-# feature.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=XSL Feature SDK (Incubating)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=XSLT Feature as SDK
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 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
-################ end of copyright property ####################################
-
-# "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\
-June 06, 2007\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\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.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/features/org.eclipse.wst.xsl_sdk.feature/feature.xml b/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
deleted file mode 100644
index d148ec7..0000000
--- a/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xsl_sdk.feature"
-      label="XSL SDK Feature"
-      version="0.5.0.qualifier"
-      provider-name="Eclipse.org">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.xsl.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xsl.feature.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xsl.docbook.feature"
-         version="0.0.0"
-         optional="true"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xsl_sdk.feature/license.html b/features/org.eclipse.wst.xsl_sdk.feature/license.html
deleted file mode 100644
index 303e665..0000000
--- a/features/org.eclipse.wst.xsl_sdk.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>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".</P>
-<P>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.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". 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>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
-  <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>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>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>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>
-  
-  <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.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></BODY></HTML>