This commit was manufactured by cvs2svn to create tag 'v200811202217'.
diff --git a/bundles/org.eclipse.wst.xsl.core/.classpath b/bundles/org.eclipse.wst.xsl.core/.classpath
deleted file mode 100644
index d2b5cb3..0000000
--- a/bundles/org.eclipse.wst.xsl.core/.classpath
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src_sse"/>
-	<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/xerces/**"/>
-			<accessrule kind="accessible" pattern="org/apache/xalan/**"/>
-			<accessrule kind="accessible" pattern="org/apache/xml/**"/>
-			<accessrule kind="accessible" pattern="org/apache/xpath/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="*org/eclipse/wst/xsl/**"/>
-			<accessrule kind="accessible" pattern="**/validation/**"/>
-			<accessrule kind="accessible" pattern="**/sse/**"/>
-			<accessrule kind="accessible" pattern="**/xml/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsl.core/.cvsignore b/bundles/org.eclipse.wst.xsl.core/.cvsignore
deleted file mode 100644
index 964f6df..0000000
--- a/bundles/org.eclipse.wst.xsl.core/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-src_xpath
-xpathgrammar
diff --git a/bundles/org.eclipse.wst.xsl.core/.project b/bundles/org.eclipse.wst.xsl.core/.project
deleted file mode 100644
index 72c2525..0000000
--- a/bundles/org.eclipse.wst.xsl.core/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.core</name>
-	<comment>JavaCC Nature</comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>sf.eclipse.javacc.javaccbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>sf.eclipse.javacc.javaccnature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.xsl.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xsl.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 35c4745..0000000
--- a/bundles/org.eclipse.wst.xsl.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,73 +0,0 @@
-#Tue Mar 18 11:38:33 GMT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.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.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeUncheckedExceptions=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/bundles/org.eclipse.wst.xsl.core/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.xsl.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index c2645f4..0000000
--- a/bundles/org.eclipse.wst.xsl.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Mar 18 11:38:05 GMT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
diff --git a/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 1232750..0000000
--- a/bundles/org.eclipse.wst.xsl.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,42 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsl.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.xsl.core.internal.XSLCorePlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.301,2.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.300,2.0.0)",
- org.apache.ant;bundle-version="[1.7.0,2.0.0)";resolution:=optional,
- org.eclipse.wst.validation;bundle-version="[1.1.103,2.0.0)",
- org.apache.xalan;bundle-version="[2.7.1,2.8.0)",
- org.eclipse.wst.xml.xpath.core;bundle-version="[1.0.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.wst.xsl.core;uses:="org.eclipse.wst.xsl.core.internal.model,org.eclipse.core.resources,org.eclipse.core.runtime",
- org.eclipse.wst.xsl.core.internal;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.ant;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.encoding;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.modelhandler;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.parser;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.parser.regions;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.preferences;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.regions;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.text;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.text.rules;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.util;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.validation;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.validation.eclipse;x-internal:=true,
- org.eclipse.wst.xsl.core.internal.xinclude;x-internal:=true,
- org.eclipse.wst.xsl.core.model,
- org.eclipse.wst.xsl.core.resolver;
-  uses:="org.eclipse.wst.common.uriresolver.internal.provisional,
-   org.xml.sax,
-   org.xml.sax.ext,
-   org.xml.sax.helpers,
-   org.eclipse.core.resources"
diff --git a/bundles/org.eclipse.wst.xsl.core/about.html b/bundles/org.eclipse.wst.xsl.core/about.html
deleted file mode 100644
index 991d714..0000000
--- a/bundles/org.eclipse.wst.xsl.core/about.html
+++ /dev/null
@@ -1,52 +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, 2008</P>
-
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-		
-<h3>Third Party Content</h3>
-<p>The Content includes items that have been sourced from third parties as set out below. If you 
-did not receive this Content directly from the Eclipse Foundation, the following is provided 
-for informational purposes only, and you should look to the Redistributor's license for 
-terms and conditions of use.</p>
-<p>
-<strong>XSLT and XInclude Schema</strong> <br/><br/>
-
-The following XML Schema in the plug-in are based on W3C code available on the World Wide Web Consortium website
-and shall be defined as the "W3C-Derived Work":<br/><br/>
-
-xslt-schemas/xslt-1.0.xsd (derived from <a href="http://www.w3.org/XML/2000/04schema-hacking/xslt.xsd">W3C XSLT 1.0 Schema</a>)<br/>
-xslt-schemas/xslt-2.0.xsd (derived from <a href="http://www.w3.org/2005/02/schema-for-xslt20.xsd">W3C XSLT 2.0 Schema</a>)<br/>
-xslt-schemas/xinclude.xsd (copied from <a href="http://www.w3.org/TR/xinclude/">XInclude Schema</a>)<br/><br/>
-
-Your use of the W3C-Derived Work is subject to the terms and conditions of the W3C Software License.<br/> 
-A copy of the license is contained in the file <a href="about_files/W3CSoftwareLicense.html">W3CSoftwareLicense.html</a> and is 
-also available at <a href="http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231">http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</a>. 
-</p>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.xsl.core/about_files/W3CSoftwareLicense.html b/bundles/org.eclipse.wst.xsl.core/about_files/W3CSoftwareLicense.html
deleted file mode 100644
index 1dffe56..0000000
--- a/bundles/org.eclipse.wst.xsl.core/about_files/W3CSoftwareLicense.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>W3C Software License</title>
-  <link rel="stylesheet" type="text/css" href="/StyleSheets/base.css" />
-  <style type="text/css">
- <!--
-h3#version { margin-top: -0.8em;}  
--->
-
-
-
-
-
-
-
-
-
-  </style>
-</head>
-
-<body text="#000000" bgcolor="#FFFFFF">
-<h1>W3C<sup>®</sup> SOFTWARE NOTICE AND LICENSE</h1>
-
-<h3 id="version"><a
-href="http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231">http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231</a></h3>
-
-<p>This work (and included software, documentation such as READMEs, or other
-related items) is being provided by the copyright holders under the following
-license. By obtaining, using and/or copying this work, you (the licensee)
-agree that you have read, understood, and will comply with the following
-terms and conditions.</p>
-
-<p>Permission to copy, modify, and distribute this software and its
-documentation, with or without modification,&nbsp;for any purpose and without
-fee or royalty is hereby granted, provided that you include the following on
-ALL copies of the software and documentation or portions thereof, including
-modifications:</p>
-<ol>
-  <li>The full text of this NOTICE in a location viewable to users of the
-    redistributed or derivative work.</li>
-  <li>Any pre-existing intellectual property disclaimers, notices, or terms
-    and conditions. If none exist, the <a
-    href="copyright-software-short-notice-20021231.html">W3C Software Short
-    Notice</a> should be included (hypertext is preferred, text is permitted)
-    within the body of any redistributed or derivative code.</li>
-  <li>Notice of any changes or modifications to the files, including the date
-    changes were made. (We recommend you provide URIs to the location from
-    which the code is derived.)</li>
-</ol>
-
-<p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
-MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
-PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE
-ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
-
-<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
-DOCUMENTATION.</p>
-
-<p>The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without specific, written
-prior permission. Title to copyright in this software and any associated
-documentation will at all times remain with copyright holders.</p>
-
-<p></p>
-
-<p>____________________________________</p>
-
-<p>This formulation of W3C's notice and license became active on December 31
-2002. This version removes the copyright ownership notice such that this
-license can be used with materials other than those owned by the W3C,
-reflects that ERCIM is now a host of the W3C, includes references to this
-specific dated version of the license, and removes the ambiguous grant of
-"use". Otherwise, this version is the same as the <a
-href="http://www.w3.org/Consortium/Legal/copyright-software-19980720">previous
-version</a> and is written so as to preserve the <a
-href="http://www.gnu.org/philosophy/license-list.html#GPLCompatibleLicenses">Free
-Software Foundation's assessment of GPL compatibility</a> and <a
-href="http://www.opensource.org/licenses/W3C.php">OSI's certification</a>
-under the <a href="http://www.opensource.org/docs/definition.php">Open Source
-Definition</a>. Please see our <a
-href="http://www.w3.org/Consortium/Legal/IPR-FAQ">Copyright FAQ</a> for
-common questions about using materials from our site, including specific
-terms and conditions for packages like libwww, Amaya, and Jigsaw. Other
-questions about this notice can be directed to <a
-href="mailto:site-policy@w3.org">site-policy@w3.org</a>.<br />
-&nbsp;</p>
-<address>
-  Joseph Reagle &lt;<a
-  href="mailto:site-policy@w3.org">site-policy@w3.org&gt;</a>
-</address>
-
-<p>Last revised $Id: W3CSoftwareLicense.html,v 1.1 2008/08/02 13:03:11 dsatchwel Exp $</p>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.xsl.core/build.properties b/bundles/org.eclipse.wst.xsl.core/build.properties
deleted file mode 100644
index 2c3b42d..0000000
--- a/bundles/org.eclipse.wst.xsl.core/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.. = src/,\
-           src_sse/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               xslt-schemas/,\
-               lib/,\
-               bin/,\
-               about.html,\
-               about_files/
diff --git a/bundles/org.eclipse.wst.xsl.core/lib/.cvsignore b/bundles/org.eclipse.wst.xsl.core/lib/.cvsignore
deleted file mode 100644
index 6dc6df9..0000000
--- a/bundles/org.eclipse.wst.xsl.core/lib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-antlr-runtime-3.0.1.jar
-commons-jxpath-1.2.jar
diff --git a/bundles/org.eclipse.wst.xsl.core/lib/xinclude.jar b/bundles/org.eclipse.wst.xsl.core/lib/xinclude.jar
deleted file mode 100644
index fc3203a..0000000
--- a/bundles/org.eclipse.wst.xsl.core/lib/xinclude.jar
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.core/plugin.properties b/bundles/org.eclipse.wst.xsl.core/plugin.properties
deleted file mode 100644
index 0765552..0000000
--- a/bundles/org.eclipse.wst.xsl.core/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.core
-Bundle-Name.0 = XSL Core (Incubating)
-Bundle-Vendor.0 =Eclipse.org
-XSL.ContentType.Name=XSL Template
-DITA_Content_Type_Extension_Element.name=DITA
-Docbook_Content_Type_Extension_Element.name=Docbook
-XSL.Validator.Name=XSL Validator
-XSL.ValidatorDelegate.Name=XSL Validator del
-# ====================================================================
-pluginName = XSL Core (Incubating)
-providerName = Eclipse.org
diff --git a/bundles/org.eclipse.wst.xsl.core/plugin.xml b/bundles/org.eclipse.wst.xsl.core/plugin.xml
deleted file mode 100644
index bf8c0ec..0000000
--- a/bundles/org.eclipse.wst.xsl.core/plugin.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-	<!-- Team provider info -->
-
-	<extension point="org.eclipse.team.core.fileTypes">
-		<fileTypes type="text" extension="xsl" />
-		<fileTypes type="text" extension="xslt" />
-	</extension>
-
-	<extension point="org.eclipse.core.runtime.contentTypes">
-		<!-- content-type
-			file-extensions="xsl,xslt"
-			priority="normal"
-			name="%XSL.ContentType.Name"
-			id="xslsource"
-			base-type="org.eclipse.core.runtime.xml"			
-			default-charset="UTF-8">
-			<describer class="org.eclipse.core.runtime.content.XMLRootElementContentDescriber">
-				<parameter name="element" value="stylesheet"/>
-			</describer>
-		</content-type -->
-  <content-type
-        base-type="org.eclipse.core.runtime.xml"
-        file-extensions="dita,ditamap"
-        id="org.eclipse.wst.xsl.core.content-type.ditasource"
-        name="%DITA_Content_Type_Extension_Element.name"
-        priority="high">
-  </content-type>
-  <content-type
-        base-type="org.eclipse.core.runtime.xml"
-        file-extensions="dbk"
-        id="org.eclipse.wst.xsl.core.content-type.docbooksource"
-        name="%Docbook_Content_Type_Extension_Element.name"
-        priority="high">
-  </content-type>
-	</extension>
-	
-	<!-- The magic which detects XSLT 1.0 or 2.0 stylesheets and supplies the correct XSD -->	
- 	<extension
-       	point="org.eclipse.wst.common.uriresolver.resolverExtensions">
-    	<resolverExtension
-          	class="org.eclipse.wst.xsl.core.resolver.ResolverExtension"
-        	  stage="prenormalization">
-    	</resolverExtension>
-	</extension>
-
-   <extension
-         id="problem"
-         name="XSL Problem"
-         point="org.eclipse.core.resources.markers">
-		<super type="org.eclipse.wst.xml.core.validationMarker"/>
-		<persistent value="true"/>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ant.core.antTasks">
-      <antTask
-            class="org.eclipse.wst.xsl.core.internal.ant.XIncludeTask"
-            headless="true"
-            library="lib/xinclude.jar"
-            name="xsl.xinclude">
-      </antTask>
-   </extension>
-   <!-- Extra Classpath -->
-   <extension
-         point="org.eclipse.ant.core.extraClasspathEntries">
-      <extraClasspathEntry
-            library="lib/xinclude.jar">
-      </extraClasspathEntry>
-   </extension>
-
-   <extension id="xsl" name="%XSL.Validator.Name" point="org.eclipse.wst.validation.validatorV2">
-      <validator
-            build="true"
-            class="org.eclipse.wst.xsl.core.internal.validation.eclipse.Validator"
-            sourceid="org.eclipse.wst.xsl.ui.internal.validation.DelegatingSourceValidatorForXSL"
-            manual="true"
-            markerId="org.eclipse.wst.xsl.core.problem"
-            version="2">
-         <include>
-            <rules>
-               <fileext caseSensitive="false" ext="xsl"/>
- 				<contentType id="org.eclipse.wst.xml.core.xslsource"/>
-            </rules>
-         </include>
-      </validator>
-   </extension>
-   
-   
-	<extension
-		point="org.eclipse.core.filebuffers.documentCreation"
-		id="org.eclipse.wst.xml.core.documentfactories"
-		name="%Structured_XML_Document_Factory_Extension.name">
-		<factory
-			contentTypeId="org.eclipse.wst.xml.core.xslsource"
-			class="org.eclipse.wst.sse.core.internal.filebuffers.BasicStructuredDocumentFactory" />
-	</extension>
- 	<extension
-         point="org.eclipse.wst.sse.core.modelHandler">
-      <modelHandler
-            default="true"
-            class="org.eclipse.wst.xsl.core.internal.modelhandler.ModelHandlerForXSL"
-            associatedContentTypeId="org.eclipse.wst.xml.core.xslsource"
-            id="org.eclipse.wst.xsl.core.handler">
-      </modelHandler>
-    </extension>
-  <extension
-        point="org.eclipse.wst.xml.core.catalogContributions">
-     <catalogContribution>
-        <uri
-              id="org.w3c.xinclude"
-              name="http://www.w3.org/2001/XInclude"
-              uri="xslt-schemas/xinclude.xsd">
-        </uri>
-     </catalogContribution>
-  </extension>
-  <extension
-        point="org.eclipse.core.runtime.preferences">
-     <initializer
-           class="org.eclipse.wst.xsl.core.internal.preferences.PreferenceInitializer">
-     </initializer>
-  </extension>	
-   
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/Messages.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/Messages.java
deleted file mode 100644
index 50f4197..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/Messages.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- * Jesper Steen M�ller - adapted from org.eclipse.core.internal.content
- **********************************************************************/
-package org.eclipse.wst.xsl.core;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author Jesper Steen
- * @since 1.0
- *
- */
-// Runtime plugin message catalog
-
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.core.messages"; //$NON-NLS-1$
-
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	// Content type manager
-	public static String XSLCorePlugin_parserConfiguration;
-
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XSLCorePlugin_badInitializationData;
-
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XSLCorePlugin_coreError;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_0;
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_1;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_2;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_3;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_4;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_5;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_6;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_7;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_8;
-	
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static String XIncludeTask_9;
-	public static String XSLValidator_1;
-	/**
-	 * Stylesheet importing itself
-	 */
-	public static String XSLValidator_10;
-	/**
-	 * Template conflict (internal)
-	 */
-	public static String XSLValidator_11;
-	/**
-	 * Template conflict (included)
-	 */
-	public static String XSLValidator_12;
-	/**
-	 * Template conflict (external)
-	 */
-	public static String XSLValidator_13;
-	/**
-	 * Parameter missing name attribute
-	 */
-	public static String XSLValidator_14;
-	/**
-	 * Parameter with empty name attribute
-	 */
-	public static String XSLValidator_15;
-	/**
-	 * Duplicate parameter
-	 */
-	public static String XSLValidator_16;
-	/**
-	 * Unresolved named template
-	 */
-	public static String XSLValidator_18;
-	/**
-	 * Circular reference
-	 */
-	public static String XSLValidator_2;
-	/**
-	 * Parameter without default value
-	 */
-	public static String XSLValidator_20;
-	/**
-	 * Parameter does not exist
-	 */
-	public static String XSLValidator_22;
-	/**
-	 * href attribute is required
-	 */
-	public static String XSLValidator_23;
-	/**
-	 * Missing parameter
-	 */
-	public static String XSLValidator_3;
-	/**
-	 * Unresolved include
-	 */
-	public static String XSLValidator_4;
-	/**
-	 * Stylesheet includes itself
-	 */
-	public static String XSLValidator_6;
-	/**
-	 *  Unresolved import
-	 */
-	public static String XSLValidator_8;
-	
-	
-
-	static {
-		// load message values from bundle file
-		reloadMessages();
-	}
-
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static void reloadMessages() {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/ValidationPreferences.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/ValidationPreferences.java
deleted file mode 100644
index 816fbd3..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/ValidationPreferences.java
+++ /dev/null
@@ -1,109 +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.core;
-
-/**
- * Preference constants specific to the XSL validator.
- * 
- * @author Doug Satchwell
- * @see org.eclipse.core.resources.IMarker
- */
-public class ValidationPreferences
-{
-	
-	/**
-	 * The maximum number of errors allowed per XSL file.
-	 * <p>
-	 * Value is of type <code>Integer</code>.
-	 * </p>
-	 */
-	public static final String MAX_ERRORS = "MAX_ERRORS"; //$NON-NLS-1$
-	
-	/**
-	 * The level at which a missing parameter is reported.
-	 * <p>
-	 * Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
-	 * </p>
-	 */
-	public static final String MISSING_PARAM = "MISSING_PARAM"; //$NON-NLS-1$
-	
-	/**
-	 * The level at which an invalid XPath is reported.
-	 * <p>
-	 * Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
-	 * </p>
-	 */
-	public static final String XPATHS = "CHECK_XPATHS"; //$NON-NLS-1$
-	
-	/**
-	 * The level at which an unresolved called template is reported. 
-	 * <p>
-	 * Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
-	 * </p>
-	 */
-	public static final String CALL_TEMPLATES = "CHECK_CALL_TEMPLATES"; //$NON-NLS-1$
-	
-	/**
-	 * The level at which a parameter that does not have a default value and does not specify a value is reported.
-	 * <p>
-	 * Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
-	 * </p>
-	 */
-	public static final String EMPTY_PARAM = "EMPTY_PARAM"; //$NON-NLS-1$
-	
-	/**
-	 * The level at which an unresolved import or included is reported.
-	 * <p>
-	 * Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
-	 * </p>
-	 */
-	public static final String MISSING_INCLUDE = "MISSING_INCLUDE"; //$NON-NLS-1$
-	
-	/**
-	 * The level at which an include/import circular references is reported.
-	 * <p>
-	 * Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
-	 * </p>
-	 */
-	public static final String CIRCULAR_REF = "CIRCULAR_REF"; //$NON-NLS-1$
-	
-	/**
-	 * The level at which a template conflict is reported.
-	 * <p>
-	 * Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
-	 * </p>
-	 */
-	public static final String TEMPLATE_CONFLICT = "TEMPLATE_CONFLICT"; //$NON-NLS-1$
-	
-	/**
-	 * The level at which a parameter without a name attribute is reported.
-	 * <p>
-	 * Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
-	 * </p>
-	 */
-	public static final String NAME_ATTRIBUTE_MISSING = "NAME_ATTRIBUTE_MISSING"; //$NON-NLS-1$
-	
-	/**
-	 * The level at which a parameter with an empty name attribute is reported.
-	 * <p>
-	 * Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
-	 * </p>
-	 */
-	public static final String NAME_ATTRIBUTE_EMPTY = "NAME_ATTRIBUTE_EMPTY"; //$NON-NLS-1$
-	
-	/**
-	 * The level at which a duplicate parameter is reported.
-	 * <p>
-	 * Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
-	 * </p>
-	 */
-	public static final String DUPLICATE_PARAMETER = "DUPLICATE_PARAMETER"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/XSLCore.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/XSLCore.java
deleted file mode 100644
index 05a1b62..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/XSLCore.java
+++ /dev/null
@@ -1,245 +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.core;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocument;
-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.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsl.core.internal.StylesheetBuilder;
-import org.eclipse.wst.xsl.core.internal.util.FileUtil;
-import org.eclipse.wst.xsl.core.model.Stylesheet;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * The interface to all aspects of the XSL core functionality.
- * <p>
- * This is responsible for building and maintaining the cache of built XSL models.
- * </p>
- * 
- * @author Doug Satchwell
- */
-public class XSLCore
-{
-	/**
-	 * The XSL namespace URI (= http://www.w3.org/1999/XSL/Transform)
-	 */
-	public static final String XSL_NAMESPACE_URI = "http://www.w3.org/1999/XSL/Transform"; //$NON-NLS-1$
-	
-	/**
-	 * The XSL content type (= org.eclipse.wst.xml.core.xslsource)
-	 */
-	public static final String XSL_CONTENT_TYPE = "org.eclipse.wst.xml.core.xslsource"; //$NON-NLS-1$
-	
-	private static XSLCore instance;
-	private Map<IFile, StylesheetModel> stylesheetsComposed = new HashMap<IFile, StylesheetModel>();
-
-	private XSLCore()
-	{}
-
-	/**
-	 * Get the cached stylesheet, or build it if it has not yet been built.
-	 * 
-	 * @param file
-	 * @return source file, or null if could not be built
-	 * @since 1.0
-	 */
-	public synchronized StylesheetModel getStylesheet(IFile file)
-	{
-		StylesheetModel stylesheet = stylesheetsComposed.get(file);
-		if (stylesheet == null)
-			stylesheet = buildStylesheet(file);
-		return stylesheet;
-	}
-
-	/**
-	 * Completely rebuild the source file from its DOM
-	 * 
-	 * @param file
-	 * @return the stylesheet model, or null if it could not be created.
-	 * @since 1.0
-	 */
-	public synchronized StylesheetModel buildStylesheet(IFile file)
-	{
-		Stylesheet stylesheet = StylesheetBuilder.getInstance().getStylesheet(file, true);
-		if (stylesheet == null)
-			return null;
-		StylesheetModel stylesheetComposed = new StylesheetModel(stylesheet);			
-		stylesheetsComposed.put(file, stylesheetComposed);
-		stylesheetComposed.fix();
-		return stylesheetComposed;
-	}
-	
-	/**
-	 * Clean all of the stylesheets from the given project.
-	 * 
-	 * @param project the project to be cleaned
-	 * @param monitor a progress monitor to track the clean progress
-	 */
-	public synchronized void clean(IProject project, IProgressMonitor monitor)
-	{
-		for (Iterator<StylesheetModel> iter = stylesheetsComposed.values().iterator(); iter.hasNext();)
-		{
-			StylesheetModel model = iter.next();
-			if (project == null || project.equals(model.getStylesheet().getFile().getProject()))
-			{
-				iter.remove();
-			}
-		}
-	}
-
-	/**
-	 * Get the singleton <code>XSLCore</code> instance.
-	 * 
-	 * @return the <code>XSLCore</code> instance
-	 */
-	public static synchronized XSLCore getInstance()
-	{
-		if (instance == null)
-			instance = new XSLCore();
-		return instance;
-	}
-
-	/**
-	 * Locates a file for the given current file and URI.
-	 * 
-	 * @param currentFile the file to resolve relative to
-	 * @param uri the relative URI 
-	 * @return the file at the URI relative to this <code>currentFile</code>
-	 */
-	// TODO depends on how we resolve URIs		
-	public static IFile resolveFile(IFile currentFile, String uri)
-	{
-		if (uri == null || uri.trim().length() == 0)
-			return null;
-		IResource resource = currentFile.getParent().findMember(new Path(uri));
-		if (resource == null || resource.getType() != IResource.FILE)
-			return null;		
-		return (IFile)resource;
-	}
-	/**
-	 * Determine whether the given file is an XML file by inspecting its content types.
-	 * 
-	 * @param file the file to inspect
-	 * @return true if this file is an XML file
-	 */
-
-	public static boolean isXMLFile(IFile file)
-	{
-		return FileUtil.isXMLFile(file);
-	}
-
-	/**
-	 * Determine whether the given file is an XSL file by inspecting its content types.
-	 * 
-	 * @param file the file to inspect
-	 * @return true if this file is an XSL file
-	 */
-	public static boolean isXSLFile(IFile file)
-	{
-		return FileUtil.isXSLFile(file);
-	}
-	
-	
-	/**
-	 * Takes a given <code>IDOMNode</code> and returns whether it 
-	 * is part of the the XSLT Namespace.
-	 * @param node  The IDOMNode to be checked.
-	 * @return True if part of the XSLT namespace, false otherwise.
-	 */
-	public static boolean isXSLNamespace(IDOMNode node) {
-		if (hasNamespace(node)) {
-			return false;
-		}
-		return node.getNamespaceURI().equals(XSL_NAMESPACE_URI);
-	}
-
-	/**
-	 * Determine if the Node that was passed has a Namespace.  If it
-	 * doesn't the node is either going to be false, or the call to the
-	 * getNamespace() method will return null.
-	 * @param node
-	 * @return
-	 */
-	private static boolean hasNamespace(IDOMNode node) {
-		return node == null || node.getNamespaceURI() == null;
-	}
-	
-	/**
-	 * Returns an Attr node for the current Node if one exits at the specified offset.
-	 * @param node 
-	 * @param offset 
-	 * @return A w3c.dom.Attr
-	 * @since 1.0
-	 */
-	public static 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;
-	}
-
-	/**
-	 * Returns the current Node at the specified offset.
-	 * 
-	 * @param document 
-	 * @param offset 
-	 * @return an w3c.dom.Node
-	 * @since 1.0
-	 */
-	public static 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;
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/StylesheetBuilder.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/StylesheetBuilder.java
deleted file mode 100644
index cd0b34c..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/StylesheetBuilder.java
+++ /dev/null
@@ -1,292 +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 - fix issue with xslElm being null on local variables.
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.internal;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Stack;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.util.Debug;
-import org.eclipse.wst.xsl.core.model.CallTemplate;
-import org.eclipse.wst.xsl.core.model.Import;
-import org.eclipse.wst.xsl.core.model.Include;
-import org.eclipse.wst.xsl.core.model.Parameter;
-import org.eclipse.wst.xsl.core.model.Stylesheet;
-import org.eclipse.wst.xsl.core.model.Template;
-import org.eclipse.wst.xsl.core.model.Variable;
-import org.eclipse.wst.xsl.core.model.XSLAttribute;
-import org.eclipse.wst.xsl.core.model.XSLElement;
-import org.eclipse.wst.xsl.core.model.XSLNode;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * A builder that creates and maintains a cache of <code>Stylesheet</code>'s.
- * 
- * @author Doug Satchwell
- */
-public class StylesheetBuilder {
-	private static StylesheetBuilder instance;
-	private final Map<IFile, Stylesheet> builtFiles = new HashMap<IFile, Stylesheet>();
-
-	private StylesheetBuilder() {
-	}
-
-	/**
-	 * Get the <code>Stylesheet</code> associated with the given file. If either
-	 * the <code>Stylesheet</code> has not yet been created or
-	 * <code>force</code> is specified then the <code>Stylesheet</code> is
-	 * built.
-	 * 
-	 * @param file
-	 *            the XSL file
-	 * @param force
-	 *            <code>true</code> to force a parse of the file
-	 * @return the <code>Stylesheet</code>
-	 */
-	public Stylesheet getStylesheet(IFile file, boolean force) {
-		Stylesheet stylesheet = builtFiles.get(file);
-		if (stylesheet == null || force) {
-			stylesheet = build(file);
-			builtFiles.put(file, stylesheet);
-		}
-		return stylesheet;
-	}
-
-	private Stylesheet build(IFile file) {
-		long start = System.currentTimeMillis();
-		if (Debug.debugXSLModel) {
-			System.out.println("Building " + file + "...");
-		}
-
-		Stylesheet stylesheet = null;
-		IStructuredModel smodel = null;
-		try {
-			smodel = StructuredModelManager.getModelManager()
-					.getExistingModelForRead(file);
-			if (smodel == null) {
-				smodel = StructuredModelManager.getModelManager()
-						.getModelForRead(file);
-				if (Debug.debugXSLModel) {
-					long endParse = System.currentTimeMillis();
-					System.out.println("PARSE " + file + " in "
-							+ (endParse - start) + "ms");
-				}
-			} else if (Debug.debugXSLModel) {
-				long endParse = System.currentTimeMillis();
-				System.out.println("NO-PARSE " + file + " in "
-						+ (endParse - start) + "ms");
-			}
-			// start = System.currentTimeMillis();
-			if (smodel != null && smodel instanceof IDOMModel) {
-				IDOMModel model = (IDOMModel) smodel;
-				stylesheet = parseModel(model, file);
-			}
-		} catch (IOException e) {
-			XSLCorePlugin.log(e);
-		} catch (CoreException e) {
-			XSLCorePlugin.log(e);
-		} finally {
-			if (smodel != null)
-				smodel.releaseFromRead();
-		}
-		if (Debug.debugXSLModel) {
-			long end = System.currentTimeMillis();
-			System.out.println("BUILD " + file + " in " + (end - start) + "ms");
-		}
-		return stylesheet;
-	}
-
-	private Stylesheet parseModel(IDOMModel model, IFile file) {
-		IDOMDocument document = model.getDocument();
-		Stylesheet sf = new Stylesheet(file);
-		StylesheetParser walker = new StylesheetParser(sf);
-		walker.walkDocument(document);
-		return sf;
-	}
-
-	/**
-	 * Get the singleton <code>StylesheetBuilder</code> instance.
-	 * 
-	 * @return the <code>StylesheetBuilder</code> instance
-	 */
-	public static synchronized StylesheetBuilder getInstance() {
-		if (instance == null) {
-			instance = new StylesheetBuilder();
-		}
-		return instance;
-	}
-
-	private static class StylesheetParser {
-		private final Stylesheet sf;
-		private final Stack<Element> elementStack = new Stack<Element>();
-		private Template currentTemplate;
-		private Stack<CallTemplate> callTemplates = new Stack<CallTemplate>();
-		private XSLElement parentEl;
-
-		public StylesheetParser(Stylesheet stylesheet) {
-			this.sf = stylesheet;
-		}
-
-		public void walkDocument(IDOMDocument document) {
-
-			if (document.getDocumentElement() != null)
-				recurse(document.getDocumentElement());
-		}
-
-		private void recurse(Element element) {
-			XSLElement xslEl = null;
-			if (XSLCore.XSL_NAMESPACE_URI.equals(element.getNamespaceURI())) {
-				String elName = element.getLocalName();
-				if ("stylesheet".equals(elName) && elementStack.size() == 0) //$NON-NLS-1$
-				{
-					NamedNodeMap map = element.getAttributes();
-					String version = element.getAttribute("version");
-					sf.setVersion(version);
-					xslEl = sf;
-				} else if ("include".equals(elName) && elementStack.size() == 1) //$NON-NLS-1$
-				{
-					Include include = new Include(sf);
-					sf.addInclude(include);
-					xslEl = include;
-				} else if ("import".equals(elName) && elementStack.size() == 1) //$NON-NLS-1$
-				{
-					Import include = new Import(sf);
-					sf.addImport(include);
-					xslEl = include;
-				} else if ("template".equals(elName) && elementStack.size() == 1) //$NON-NLS-1$
-				{
-					currentTemplate = new Template(sf);
-					sf.addTemplate(currentTemplate);
-					xslEl = currentTemplate;
-				} else if ("param".equals(elName) && elementStack.size() == 2 && currentTemplate != null) //$NON-NLS-1$
-				{
-					Parameter param = new Parameter(sf);
-					// determine whether param has a value
-					NodeList childNodes = element.getChildNodes();
-					for (int i = 0; i < childNodes.getLength(); i++) {
-						Node childNode = childNodes.item(i);
-						if (childNode.getNodeType() != Node.ATTRIBUTE_NODE) {
-							param.setValue(true);
-							break;
-						}
-					}
-					currentTemplate.addParameter(param);
-					xslEl = param;
-				} else if ("call-template".equals(elName) && elementStack.size() >= 2) //$NON-NLS-1$
-				{
-					CallTemplate currentCallTemplate = new CallTemplate(sf);
-					callTemplates.push(currentCallTemplate);
-					sf.addCalledTemplate(currentCallTemplate);
-					xslEl = currentCallTemplate;
-				} else if ("with-param".equals(elName) && elementStack.size() >= 3 && callTemplates.size() > 0) //$NON-NLS-1$
-				{
-					Parameter param = new Parameter(sf);
-					// determine whether param has a value
-					NodeList childNodes = element.getChildNodes();
-					for (int i = 0; i < childNodes.getLength(); i++) {
-						Node childNode = childNodes.item(i);
-						if (childNode.getNodeType() != Node.ATTRIBUTE_NODE) {
-							param.setValue(true);
-							break;
-						}
-					}
-					// get the previous call-template
-					CallTemplate currentCallTemplate = callTemplates.peek();
-					currentCallTemplate.addParameter(param);
-					xslEl = param;
-				} else if ("variable".equals(elName)) //$NON-NLS-1$
-				{
-					if (elementStack.size() == 1)
-					{// global variable
-						Variable var = new Variable(sf);
-						sf.addGlobalVariable(var);
-						xslEl = var;
-					}
-					else if (elementStack.size() > 1 && currentTemplate != null)
-					{// local variable
-						Variable var = new Variable(sf);
-						currentTemplate.addVariable(var);
-						xslEl = var;
-					}
-				} 
-				else {
-					xslEl = new XSLElement(sf);
-				}
-				if (xslEl!=null)
-					configure((IDOMNode) element, xslEl);
-			}
-			elementStack.push(element);
-			NodeList childNodes = element.getChildNodes();
-			for (int i = 0; i < childNodes.getLength(); i++) {
-				Node node = childNodes.item(i);
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					recurse((Element) node);
-				}
-			}
-			if (xslEl instanceof CallTemplate)
-				callTemplates.pop();
-			elementStack.pop();
-			// currentTemplate = null;
-			// currentCallTemplate = null;
-		}
-
-		private void configure(IDOMNode node, XSLElement element) {
-			setPositionInfo(node, element);
-			IDOMElement domElem = (IDOMElement) node;
-			element.setName(domElem.getLocalName());
-			NamedNodeMap map = node.getAttributes();
-			for (int i = 0; i < map.getLength(); i++) {
-				IDOMAttr attr = (IDOMAttr) map.item(i);
-				XSLAttribute xslatt = new XSLAttribute(element, attr.getName(),
-						attr.getValue());
-				setPositionInfo(attr, xslatt);
-				element.setAttribute(xslatt);
-			}
-			if (parentEl != null)
-				parentEl.addChild(element);
-			parentEl = element;
-		}
-
-		private static void setPositionInfo(IDOMNode node, XSLNode inc) {
-			try {
-				IStructuredDocument structuredDocument = node
-						.getStructuredDocument();
-				int line = structuredDocument.getLineOfOffset(node
-						.getStartOffset());
-				int lineOffset = structuredDocument.getLineOffset(line);
-				int col = node.getStartOffset() - lineOffset;
-				inc.setOffset(node.getStartOffset());
-				inc.setLineNumber(line);
-				inc.setColumnNumber(col);
-				inc.setLength(node.getLength());
-			} catch (BadLocationException e) {
-				XSLCorePlugin.log(e);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/XSLCorePlugin.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/XSLCorePlugin.java
deleted file mode 100644
index 3a95303..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/XSLCorePlugin.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Jesper Steen M�ller and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jesper Steen M�ller - XSL core plugin
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.core.internal;
-
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.xsl.core.Messages;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.osgi.framework.BundleContext;
-import org.osgi.util.tracker.ServiceTracker;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class XSLCorePlugin extends Plugin {
-
-	// The plug-in ID
-	/**
-	 * TODO: Add JavaDoc
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.wst.xsl.core"; //$NON-NLS-1$
-	
-	/**
-	 * 
-	 */
-	public static final String USE_PROJECT_SETTINGS = "use-project-settings";//$NON-NLS-1$
-	
-	// The shared instance
-	private static XSLCorePlugin plugin;
-	
-	private ServiceTracker parserTracker = null;
-
-	private BundleContext bundleContext;
-
-	/**
-	 * The constructor
-	 */
-	public XSLCorePlugin() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		bundleContext = 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 XSLCorePlugin getDefault() {
-		return plugin;
-	}
-	
-	/**
-	 * Return the registered SAX parser factory or null if one
-	 * does not exist.	 * @return
-	 * @return returns a SAXParserFactory
-	 */
-	public SAXParserFactory getFactory() {
-		if (parserTracker == null) {
-			parserTracker = new ServiceTracker(bundleContext, SAXParserFactory.class.getName(), null);
-			parserTracker.open();
-		}
-		SAXParserFactory theFactory = (SAXParserFactory) parserTracker.getService();
-		if (theFactory != null)
-			theFactory.setNamespaceAware(true);
-		return theFactory;
-	}
-	
-	/**
-	 * Logs the specified status with this plug-in's log.
-	 * 
-	 * @param status status to log
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Logs the specified exception.
-	 * 
-	 * @param e throwable to log 
-	 */
-	public static void log(Throwable e) {
-		if (e instanceof CoreException) {
-			log(((CoreException)e).getStatus());
-		} else {
-			log(newErrorStatus(Messages.XSLCorePlugin_coreError, e));
-		}
-	}
-	
-	/**
-	 * Returns a new error status for this plug-in with the given message
-	 * @param message the message to be included in the status
-	 * @param exception the exception to be included in the status or <code>null</code> if none
-	 * @return a new error status
-	 */
-	public static IStatus newErrorStatus(String message, Throwable exception) {
-		return new Status(IStatus.ERROR, PLUGIN_ID, message, exception);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/XIncludeTask.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/XIncludeTask.java
deleted file mode 100644
index 9a06391..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/ant/XIncludeTask.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/******************************************************************************

-* Copyright (c) 2008 Lars Vogel 

-* All rights reserved. This program and the accompanying materials

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

-* which accompanies this distribution, and is available at

-* http://www.eclipse.org/legal/eplv10.html

-*

-* Contributors:

-* Lars Vogel - Lars.Vogel@gmail.com - initial API and implementation

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

-

-package org.eclipse.wst.xsl.core.internal.ant;

-

-import java.io.File;

-import java.util.Collection;

-import java.util.Vector;

-

-import org.apache.tools.ant.BuildException;

-import org.apache.tools.ant.Project;

-import org.apache.tools.ant.Task;

-import org.eclipse.wst.xsl.core.internal.xinclude.XIncluder;

-import org.eclipse.wst.xsl.core.Messages;

-

-/**

- * This class provides an XInclude ANT task definition.

- * 

- * @author Lars Vogel

- *

- */

-public class XIncludeTask extends Task {

-	private String inFile;

-

-	private String outFile;

-

-	/**

-	 * TODO: Add JavaDoc 

-	 * @param inFile

-	 */

-	public void setIn(String inFile) {

-		log(Messages.XIncludeTask_0 + inFile, Project.MSG_VERBOSE);

-		this.inFile = inFile;

-	}

-

-	/**

-	 * TODO: Add JavaDoc

-	 * @param outFile

-	 */

-	public void setOut(String outFile) {

-		log(Messages.XIncludeTask_1 + outFile, Project.MSG_VERBOSE);

-		this.outFile = outFile;

-	}

-

-	public void execute() {

-		validate();

-		log(Messages.XIncludeTask_2, Project.MSG_VERBOSE);

-		File file = new File(inFile);

-		if (!file.exists()) {

-			throw new BuildException(Messages.XIncludeTask_3

-					+ inFile);

-		}

-		// We will check if the file exists, if not we will try to create the

-		// output file and or the output directory

-		File fileout = new File(outFile);

-		File dir = new File(fileout.getParent());

-		if (!dir.exists()) {

-			log(Messages.XIncludeTask_4 + dir.getAbsolutePath());

-

-			Boolean success = (new File(dir.getAbsolutePath())).mkdirs();

-			if (!success) {

-				throw new BuildException(Messages.XIncludeTask_5

-						+ outFile);

-			}

-		}

-		// check if the included files are modified after the last run

-		// Assumption that all the included files are part of the input file

-		// directory

-		if (checkmodified(inFile, outFile)) {

-			log(Messages.XIncludeTask_6,

-					Project.MSG_INFO);

-			XIncluder la = new XIncluder();

-			try {

-				la.extractXMLFile(inFile, outFile);

-			} catch (Exception e) {

-				throw new BuildException(Messages.XIncludeTask_7

-						+ e.getMessage());

-			}

-		}

-	}

-

-	private boolean checkmodified(String inFile, String outFile) {

-		File in = new File(inFile);

-		File out = new File(outFile);

-		File dir = new File(in.getParent());

-

-		Collection<File> allFiles = listFiles(dir, true);

-		for (File f : allFiles) {

-			if (f.lastModified() > out.lastModified()) {

-				return true;

-			}

-		}

-		return false;

-	}

-

-	/**

-	 * TODO: Add JavaDoc

-	 * @param directory

-	 * @param recurse

-	 * @return

-	 */

-	public Collection<File> listFiles(File directory, boolean recurse) {

-		// List of files / directories

-		Vector<File> files = new Vector<File>();

-

-		// Get files / directories in the directory

-		File[] entries = directory.listFiles();

-

-		// Go over entries

-		for (File entry : entries) {

-

-			files.add(entry);

-

-			// If the file is a directory and the recurse flag

-			// is set, recurse into the directory

-			if (recurse && entry.isDirectory()) {

-				files.addAll(listFiles(entry, recurse));

-			}

-		}

-

-		// Return collection of files

-		return files;

-	}

-

-	private void validate() {

-		if (inFile == null) {

-			throw new BuildException(Messages.XIncludeTask_8);

-		}

-		if (outFile == null) {

-			throw new BuildException(Messages.XIncludeTask_9);

-		}

-	}

-}

diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/preferences/PreferenceInitializer.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/preferences/PreferenceInitializer.java
deleted file mode 100644
index 3c00b80..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/preferences/PreferenceInitializer.java
+++ /dev/null
@@ -1,43 +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.core.internal.preferences;
-
-import org.eclipse.core.resources.IMarker;
-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.core.ValidationPreferences;
-import org.eclipse.wst.xsl.core.internal.XSLCorePlugin;
-
-/**
- * Preferences initializer for XSL core preferences.
- * 
- * @author Doug Satchwell
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer
-{
-	@Override
-	public void initializeDefaultPreferences()
-	{
-		IEclipsePreferences node = new DefaultScope().getNode(XSLCorePlugin.getDefault().getBundle().getSymbolicName());
-		node.putInt(ValidationPreferences.MAX_ERRORS, 100);
-		node.putInt(ValidationPreferences.MISSING_PARAM, IMarker.SEVERITY_WARNING);
-		node.putInt(ValidationPreferences.XPATHS, IMarker.SEVERITY_ERROR);
-		node.putInt(ValidationPreferences.CALL_TEMPLATES, IMarker.SEVERITY_ERROR);
-		node.putInt(ValidationPreferences.EMPTY_PARAM, IMarker.SEVERITY_WARNING);
-		node.putInt(ValidationPreferences.MISSING_INCLUDE, IMarker.SEVERITY_ERROR);
-		node.putInt(ValidationPreferences.CIRCULAR_REF, IMarker.SEVERITY_ERROR);
-		node.putInt(ValidationPreferences.TEMPLATE_CONFLICT, IMarker.SEVERITY_ERROR);
-		node.putInt(ValidationPreferences.NAME_ATTRIBUTE_MISSING, IMarker.SEVERITY_ERROR);
-		node.putInt(ValidationPreferences.NAME_ATTRIBUTE_EMPTY, IMarker.SEVERITY_ERROR);
-		node.putInt(ValidationPreferences.DUPLICATE_PARAMETER, IMarker.SEVERITY_ERROR);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/Debug.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/Debug.java
deleted file mode 100755
index bd67ca6..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/Debug.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 - initial API and implementation based on WTP SSE Debug class
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.internal.util;
-
-
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-
-/**
- * Debug Class is used to determine when Debugging output to system out.
- * @author dcarver
- *
- */
-public final class Debug {
-	public static final boolean checkForMemoryLeaks = false;
-
-	public static final boolean collectStats = false;
-
-	public static final int DEBUG = 0;
-
-	public static final boolean DEBUG_THREADLOCAL = false;
-
-	public static final boolean debugBreakpoints = false;
-	public static final boolean debugCaretMediator = false;
-	public static final boolean debugDisplayTreePositions = false;
-	//
-	public static final boolean debugMediator = false;
-	//
-	public static final boolean debugNotification = false;
-	public static final boolean debugNotificationAndEvents = false;
-
-	public static final boolean debugNotifyDeferred = false;
-	public static final boolean debugReconciling = false;
-	//
-	public static final boolean debugRtfFormatProvider = false;
-	//
-	public static final boolean debugStructuredDocument = false;
-	public static final boolean debugTaglibs = false;
-	//
-	public static final boolean debugTokenizer = false;
-	
-	//
-	public static final boolean debugLauncher = false;
-	
-	/**
-	 * Output Modeling Messages.
-	 */
-	public static final boolean debugXSLModel = false;
-	//
-	public static final boolean debugTreeModel = false;
-	public static final boolean debugUpdateTreePositions = false;
-	public static final boolean displayInfo = false;
-
-	/** effects output of Logger */
-	public static final boolean displayToConsole = true;
-	public static final boolean displayWarnings = false;
-	//
-	public static final boolean headParsing = false;
-	public static final boolean jsDebugContextAssist = false;
-	//
-	public static final boolean jsDebugSyntaxColoring = false;
-
-	public static final boolean LOCKS = false;
-	// 
-	public static final boolean perfTest = false;
-	public static final boolean perfTestAdapterClassLoading = false;
-	public static final boolean perfTestFormat = false;
-	public static final boolean perfTestRawStructuredDocumentOnly = false;
-	public static final boolean perfTestStructuredDocumentEventOnly = false;
-	public static final boolean perfTestStructuredDocumentOnly = false;
-
-	//
-	public static final boolean syntaxHighlighting = false;
-	//
-	public static final boolean useStandardEolInWidget = false;
-
-	/**
-	 * For tests and debug only
-	 */
-
-	public static final void dump(IStructuredDocument structuredDocument) {
-		dump(structuredDocument, false);
-	}
-
-	public static final void dump(IStructuredDocument structuredDocument, boolean verbose) {
-		ITextRegionCollection flatNode = null;
-		System.out.println("Dump of structuredDocument:"); //$NON-NLS-1$
-		IStructuredDocumentRegionList flatNodes = structuredDocument.getRegionList();
-		Enumeration structuredDocumentRegions = flatNodes.elements();
-		while (structuredDocumentRegions.hasMoreElements()) {
-			flatNode = (ITextRegionCollection) structuredDocumentRegions.nextElement();
-			if (!verbose) {
-				String outString = flatNode.toString();
-				outString = org.eclipse.wst.sse.core.utils.StringUtils.escape(outString);
-				System.out.println(outString);
-			} else {
-				dump(flatNode, verbose);
-			}
-		}
-		System.out.println();
-		System.out.println("= = = = = ="); //$NON-NLS-1$
-		System.out.println();
-	}
-
-	/**
-	 * @param flatNode
-	 * @param verbose
-	 */
-	public static final void dump(ITextRegionCollection region, boolean verbose) {
-		if (region == null)
-			return;
-		if (verbose) {
-			printParent(region);
-		}
-		printChildRegions(region, 0);
-	}
-
-	private static void printChildRegions(ITextRegionCollection region, int depth) {
-		if (region != null) {
-			// ==> // ITextRegionCollection regionCollection = region;
-			System.out.println(region);
-			ITextRegionList regionList = region.getRegions();
-			for (int i = 0; i < regionList.size(); i++) {
-				ITextRegion r = regionList.get(i);
-				if (r instanceof ITextRegionCollection) {
-					ITextRegionCollection rc = (ITextRegionCollection) r;
-					printChildRegions(rc, depth++);
-				} else {
-					System.out.println(space(depth) + r);
-					depth--;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Simple utility to make sure println's are some what in order
-	 */
-	public static final synchronized void println(String msg) {
-		System.out.println(System.currentTimeMillis() + "\t" + msg); //$NON-NLS-1$
-	}
-
-	private static void printParent(IStructuredDocumentRegion region) {
-		System.out.println("    [parent document: " + toStringUtil(region.getParentDocument()) + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	private static void printParent(ITextRegionCollection region) {
-		if (region instanceof IStructuredDocumentRegion) {
-			printParent((IStructuredDocumentRegion) region);
-		} else if (region instanceof ITextRegionContainer) {
-			printParent((ITextRegionContainer) region);
-		} else
-			System.out.println("    [parent document: " + "(na)" + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-
-	private static void printParent(ITextRegionContainer region) {
-		System.out.println("    [parent document: " + toStringUtil(region.getParent()) + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * @param depth
-	 * @return
-	 */
-	private static String space(int depth) {
-		String result = "  "; //$NON-NLS-1$
-		for (int i = 0; i < depth; i++) {
-			result += "  "; //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	public static final String toStringUtil(IStructuredDocument object) {
-		String className = object.getClass().getName();
-		String shortClassName = className.substring(className.lastIndexOf(".") + 1); //$NON-NLS-1$
-		String result = shortClassName;
-		// NOTE: if the document held by any region has been updated and the
-		// region offsets have not
-		// yet been updated, the output from this method invalid.
-		return result;
-
-	}
-
-	public static final String toStringUtil(ITextRegionCollection object) {
-		String className = object.getClass().getName();
-		String shortClassName = className.substring(className.lastIndexOf(".") + 1); //$NON-NLS-1$
-		String result = shortClassName;
-		// NOTE: if the document held by any region has been updated and the
-		// region offsets have not
-		// yet been updated, the output from this method invalid.
-		return result;
-
-	}
-
-	/**
-	 * Debug constructor comment.
-	 */
-	public Debug() {
-		super();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/FileUtil.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/FileUtil.java
deleted file mode 100644
index 45f9404..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/FileUtil.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.wst.xsl.core.internal.util;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.wst.xsl.core.XSLCore;
-
-/**
- * This is a general file utility class.
- * 
- * @author dcarver
- *
- */
-public class FileUtil {
-
-	/**
-	 * Determines if a file is one of the valid XML content types.
-	 * @param file The input IFile to check
-	 * @return True if it is a XML file, false otherwise.
-	 */
-	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;
-	}
-
-	/**
-	 * Determines if a file is a XSLT File.
-	 * @param file The input IFile to check.
-	 * @return True if it is a XSLT file, false otherwise.
-	 * 
-	 */
-	public static boolean isXSLFile(IFile file)
-	{
-		IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
-		IContentType[] types = contentTypeManager.findContentTypesFor(file.getName());
-		for (IContentType contentType : types)
-		{
-			if (contentType.equals(contentTypeManager.getContentType(XSLCore.XSL_CONTENT_TYPE)))
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/StructuredDocumentUtil.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/StructuredDocumentUtil.java
deleted file mode 100644
index 1827d31..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/util/StructuredDocumentUtil.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.wst.xsl.core.internal.util;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-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.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * General Purpose utility classes to convert from StructuredDocument to DOM.
- * 
- * @author dcarver
- *
- */
-public class StructuredDocumentUtil {
-	
-	/**
-	 * Given a StructuredDocumentRegion and a TextRegion, return a
-	 * IDOMNode for that particular position in the StructuredDocument
-	 * 
-	 * @param documentRegion
-	 * @param textRegion
-	 * @return IDOMNode
-	 */
-	public static IDOMNode getNode(IStructuredDocumentRegion documentRegion, ITextRegion textRegion) {
-		IStructuredModel sModel = StructuredModelManager.getModelManager().getExistingModelForRead(documentRegion.getParentDocument());
-		IDOMDocument documentNode = ((IDOMModel) sModel).getDocument();
-
-		return (IDOMNode)documentNode.getModel().getIndexedRegion(documentRegion.getStartOffset(textRegion));
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/MaxErrorsExceededException.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/MaxErrorsExceededException.java
deleted file mode 100644
index d60bc8b..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/MaxErrorsExceededException.java
+++ /dev/null
@@ -1,22 +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.core.internal.validation;
-
-/**
- * An exception used to indicate whether the maximum number of errors has been reached 
- * for a given Stylesheet validation.
- * 
- * @author Doug Satchwell
- */
-public class MaxErrorsExceededException extends Exception
-{
-	private static final long serialVersionUID = 1L;	
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidationMessage.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidationMessage.java
deleted file mode 100644
index 0297c3f..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidationMessage.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.core.internal.validation;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xsl.core.model.XSLNode;
-
-/**
- * A validation message specific to the XSL validator which adds the ability 
- * to specify the XSL node.
- * 
- * @author Doug Satchwell
- * @see org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage
- */
-public class XSLValidationMessage extends ValidationMessage
-{
-	private XSLNode node;
-	private int realSeverity;
-
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param message
-	 *            The message for the validation message.
-	 * @param lineNumber
-	 *            The line location of the message.
-	 * @param columnNumber
-	 *            The column location of the message.
-	 * @param uri
-	 *            The uri of the file the message is for.
-	 */
-	public XSLValidationMessage(String message, int lineNumber, int columnNumber, String uri)
-	{
-		super(message, lineNumber, columnNumber, uri);
-	}
-	
-	/**
-	 * Set the node that this message applies to.
-	 * 
-	 * @param node the node
-	 */
-	public void setNode(XSLNode node)
-	{
-		this.node = node;
-	}
-
-	/**
-	 * Get the node that this message applies to.
-	 * @return the node
-	 */
-	public XSLNode getNode()
-	{
-		return node;
-	}
-	
-	/**
-	 * The severity set here should be the org.eclipse.wst.validation.internal.provisional.core.IMessage severity.
-	 */
-	@Override
-	public void setSeverity(int sev)
-	{
-		this.realSeverity = sev;
-		// the superclass only understands high and low.
-		int severity;
-		switch(sev)
-		{
-			case IMessage.HIGH_SEVERITY:
-				severity = ValidationMessage.SEV_HIGH;
-				break;
-			default:
-				severity = ValidationMessage.SEV_LOW;
-		}
-		super.setSeverity(severity);
-	}
-	
-	/**
-	 * Workaround for superclass's bizarre handling of severity
-	 * 
-	 * @return
-	 */
-	public int getRealSeverity()
-	{
-		return realSeverity;
-	}
-	
-	public String toString()
-	{
-		return node.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidationReport.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidationReport.java
deleted file mode 100644
index f8b0aff..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidationReport.java
+++ /dev/null
@@ -1,177 +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.core.internal.validation;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xsl.core.model.XSLNode;
-
-
-/**
- * A validation report for the XSL validator.
- * 
- * @author Doug Satchwell
- * @see org.eclipse.wst.xml.core.internal.validation.core.ValidationReport
- */
-public class XSLValidationReport implements ValidationReport
-{
-	private boolean valid = true;
-	private String uri;
-	private List<XSLValidationMessage> errors = new ArrayList<XSLValidationMessage>();
-	private List<XSLValidationMessage> warnings = new ArrayList<XSLValidationMessage>();
-	private List<XSLValidationMessage> infos = new ArrayList<XSLValidationMessage>();
-
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param uri
-	 *            the URI of the entity that this report applies to
-	 */
-	public XSLValidationReport(String uri)
-	{
-		this.uri = uri;
-	}
-
-	/**
-	 * Get the validation messages.
-	 * 
-	 * @return validation messages
-	 */
-	public List<XSLValidationMessage> getErrors()
-	{
-		return errors;
-	}
-
-	/**
-	 * Get the validation messages.
-	 * 
-	 * @return validation messages
-	 */
-	public List<XSLValidationMessage> getWarnings()
-	{
-		return warnings;
-	}
-
-	/**
-	 * Get the validation messages.
-	 * 
-	 * @return validation messages
-	 */
-	public List<XSLValidationMessage> getInfos()
-	{
-		return infos;
-	}
-
-	/**
-	 * Add an error message for the given XSL node.
-	 * 
-	 * @param node
-	 *            the node the warning applies to
-	 * @param message
-	 *            the message to associate with the node
-	 * @return the validation message created
-	 */
-	public ValidationMessage addError(XSLNode node, String message)
-	{
-		valid = false;
-		XSLValidationMessage msg = new XSLValidationMessage(message, node.getLineNumber() + 1, node.getColumnNumber() + 1, getFileURI());
-		msg.setSeverity(IMessage.HIGH_SEVERITY);
-		msg.setNode(node);
-		errors.add(msg);
-		return msg;
-	}
-
-	/**
-	 * Add an warning message for the given XSL node.
-	 * 
-	 * @param node
-	 *            the node the warning applies to
-	 * @param message
-	 *            the message to associate with the node
-	 * @return the validation message created
-	 */
-	public ValidationMessage addWarning(XSLNode node, String message)
-	{
-		XSLValidationMessage msg = new XSLValidationMessage(message, node.getLineNumber() + 1, node.getColumnNumber() + 1, getFileURI());
-		msg.setSeverity(IMessage.NORMAL_SEVERITY);
-		msg.setNode(node);
-		warnings.add(msg);
-		return msg;
-	}
-
-	/**
-	 * Add an info message for the given XSL node.
-	 * 
-	 * @param node
-	 *            the node the warning applies to
-	 * @param message
-	 *            the message to associate with the node
-	 * @return the validation message created
-	 */
-	public ValidationMessage addInfo(XSLNode node, String message)
-	{
-		XSLValidationMessage msg = new XSLValidationMessage(message, node.getLineNumber() + 1, node.getColumnNumber() + 1, getFileURI());
-		msg.setSeverity(IMessage.LOW_SEVERITY);
-		msg.setNode(node);
-		infos.add(msg);
-		return msg;
-	}
-
-	/**
-	 * Get the URI that this report applies to.
-	 * 
-	 * @return the URI
-	 */
-	public String getFileURI()
-	{
-		return uri;
-	}
-
-	/**
-	 * @see org.eclipse.wst.xml.core.internal.validation.core.getNestedMessages
-	 * 
-	 * @return null
-	 */
-	@SuppressWarnings("unchecked")
-	public HashMap getNestedMessages()
-	{
-		return null;
-	}
-
-	/**
-	 * Returns an array of validation messages.
-	 * 
-	 * @return An array of validation messages.
-	 */
-	public ValidationMessage[] getValidationMessages()
-	{
-		List<ValidationMessage> messages = new ArrayList<ValidationMessage>();
-		messages.addAll(errors);
-		messages.addAll(warnings);
-		messages.addAll(infos);
-		return messages.toArray(new ValidationMessage[0]);
-	}
-
-	/**
-	 * Returns whether the file is valid. The file may have warnings associated with it.
-	 * 
-	 * @return True if the file is valid, false otherwise.
-	 */
-	public boolean isValid()
-	{
-		return valid;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidator.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidator.java
deleted file mode 100644
index 741e821..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/XSLValidator.java
+++ /dev/null
@@ -1,391 +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 230072 - Project level specific validation
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.internal.validation;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.xml.xpath.XPathExpressionException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.sse.core.internal.validate.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper;
-import org.eclipse.wst.xsl.core.ValidationPreferences;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.XSLCorePlugin;
-import org.eclipse.wst.xsl.core.internal.util.Debug;
-import org.eclipse.wst.xsl.core.model.CallTemplate;
-import org.eclipse.wst.xsl.core.model.Include;
-import org.eclipse.wst.xsl.core.model.Parameter;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.eclipse.wst.xsl.core.model.Template;
-import org.eclipse.wst.xsl.core.model.XSLAttribute;
-import org.eclipse.wst.xsl.core.model.XSLElement;
-import org.eclipse.wst.xsl.core.model.XSLNode;
-import org.eclipse.wst.xsl.core.Messages;
-
-
-/**
- * The XSL validator for workspace XSL files.
- * 
- * @author Doug Satchwell
- */
-public class XSLValidator
-{
-	private static XSLValidator instance;
-	private IProject project;
-
-	private XSLValidator()
-	{
-	}
-
-	/**
-	 * Validate the given XSL file. Same as <code>validate(xslFile,report,forceBuild)</code> except a new report is created and returned.
-	 * 
-	 * @param xslFile the XSL file
-	 * @param forceBuild true if build should always be forced
-	 * @return the validation report
-	 * @throws CoreException if any exception occurs while validating
-	 */
-	public ValidationReport validate(IFile xslFile, boolean forceBuild) throws CoreException
-	{
-		XSLValidationReport report = new XSLValidationReport(xslFile.getLocationURI().toString());
-		project = xslFile.getProject();
-		validate(xslFile, report, forceBuild);
-		return report;
-	}
-
-	/**
-	 * Validate the given XSL file using the specified report.
-	 * 
-	 * @param xslFile the XSL file
-	 * @param report the report to use for reporting validation errors
-	 * @param forceBuild true if build should always be forced
-	 * @return the validation report
-	 * @throws CoreException if any exception occurs while validating
-	 */
-	public void validate(IFile xslFile, XSLValidationReport report, boolean forceBuild) throws CoreException
-	{
-		StylesheetModel stylesheet;
-		if (forceBuild)
-			stylesheet = XSLCore.getInstance().buildStylesheet(xslFile);
-		else
-			stylesheet = XSLCore.getInstance().getStylesheet(xslFile);
-		
-		project = xslFile.getProject();
-
-		long start;
-		if (Debug.debugXSLModel) {
-			start = System.currentTimeMillis();
-		}
-		if (stylesheet!=null)
-		{
-			try
-			{
-				calculateProblems(stylesheet, report);
-			}
-			catch (MaxErrorsExceededException e)
-			{
-				// do nothing
-			}
-		}
-		if (Debug.debugXSLModel) {
-			long end = System.currentTimeMillis();
-			System.out.println("VALIDATE "+xslFile+" in "+(end-start)+"ms");
-		}
-	}
-
-	private void calculateProblems(StylesheetModel stylesheetComposed, XSLValidationReport report) throws MaxErrorsExceededException
-	{
-		// circular reference check
-		checkCircularRef(stylesheetComposed, report);
-		// include checks
-		checkIncludes(stylesheetComposed, report);
-		// template checks
-		checkTemplates(stylesheetComposed, report);
-		// call-template checks
-		checkCallTemplates(stylesheetComposed, report);
-		// call-template checks
-		if (getPreference(ValidationPreferences.XPATHS) > IMarker.SEVERITY_INFO)
-			checkXPaths(stylesheetComposed.getStylesheet(), report);
-		
-		// TODO a) check globals and b) apply-templates where mode does not exist
-	}
-	
-	private int getPreference(String key)
-	{
-		if (project == null) {
-			return XSLCorePlugin.getDefault().getPluginPreferences().getInt(key);
-		}
-		
-		IEclipsePreferences prefs = new ProjectScope(project).getNode(XSLCorePlugin.getDefault().getBundle().getSymbolicName());
-		boolean useProject = prefs.getBoolean(XSLCorePlugin.USE_PROJECT_SETTINGS, false);
-		
-		int valPref;
-		if (useProject) {
-			valPref = prefs.getInt(key, ValidationMessage.WARNING);	
-		} else {
-			valPref = XSLCorePlugin.getDefault().getPluginPreferences().getInt(key);
-		}
-		return valPref;
-	}
-
-	private void checkXPaths(XSLElement xslEl, XSLValidationReport report) throws MaxErrorsExceededException
-	{
-		validateXPath(xslEl, report, "select"); //$NON-NLS-1$
-		validateXPath(xslEl, report, "test"); //$NON-NLS-1$
-		validateXPath(xslEl, report, "match"); //$NON-NLS-1$
-		for (XSLElement childEl : xslEl.getChildElements())
-		{
-			checkXPaths(childEl, report);
-		}
-	}
-
-	private void validateXPath(XSLElement xslEl, XSLValidationReport report, String attName) throws MaxErrorsExceededException
-	{
-		XSLAttribute att = xslEl.getAttribute(attName);
-		if (att != null && att.getValue() != null)
-		{
-			try
-			{
-				XSLTXPathHelper.compile(att.getValue());
-			}
-			catch (XPathExpressionException e)
-			{
-				createMarker(report, att, getPreference(ValidationPreferences.XPATHS), Messages.XSLValidator_1);
-			}
-			catch (NullPointerException e)
-			{
-				// not sure why NPE is being thrown here
-			}
-		}
-	}
-
-	private void checkCircularRef(StylesheetModel stylesheetComposed, XSLValidationReport report) throws MaxErrorsExceededException
-	{
-		if (stylesheetComposed.hasCircularReference())
-			createMarker(report, stylesheetComposed.getStylesheet(), getPreference(ValidationPreferences.CIRCULAR_REF), Messages.XSLValidator_2);
-	}
-
-	private void checkIncludes(StylesheetModel stylesheetComposed, XSLValidationReport report) throws MaxErrorsExceededException
-	{		
-		// includes
-		for (Include include : stylesheetComposed.getStylesheet().getIncludes())
-		{
-			IFile includedFile = include.getHrefAsFile();
-			if (includedFile == null || !includedFile.exists())
-			{ // included file does not exist
-				XSLAttribute att = include.getAttribute("href");  //$NON-NLS-1$
-				if (att != null)
-					createMarker(report, att, getPreference(ValidationPreferences.MISSING_INCLUDE), Messages.XSLValidator_4 + include.getHref());
-				else
-					createMarker(report, include, getPreference(ValidationPreferences.NAME_ATTRIBUTE_EMPTY), Messages.XSLValidator_23 );					
-			}
-			else if (includedFile.equals(include.getStylesheet().getFile()))
-			{ // stylesheet including itself!
-				createMarker(report, include.getAttribute("href"), getPreference(ValidationPreferences.CIRCULAR_REF), Messages.XSLValidator_6); //$NON-NLS-1$
-			}
-		}
-		//imports
-		for (Include include : stylesheetComposed.getStylesheet().getImports())
-		{
-			IFile includedFile = include.getHrefAsFile();
-			if (includedFile == null || !includedFile.exists())
-			{ // included file does not exist
-				createMarker(report, include.getAttribute("href"), getPreference(ValidationPreferences.MISSING_INCLUDE), Messages.XSLValidator_8 + include.getHref()); //$NON-NLS-1$
-			}
-			else if (includedFile.equals(include.getStylesheet().getFile()))
-			{ // stylesheet including itself!
-				createMarker(report, include.getAttribute("href"), getPreference(ValidationPreferences.CIRCULAR_REF), Messages.XSLValidator_10); //$NON-NLS-1$
-			}
-		}
-	}
-
-	private void checkTemplates(StylesheetModel stylesheetComposed, XSLValidationReport report) throws MaxErrorsExceededException
-	{
-		for (Template template : stylesheetComposed.getStylesheet().getTemplates())
-		{
-			// check attributes are correct
-			if (template.getName() != null)
-			{// named template
-//				if (template.getMatch() != null)
-//					createMarker(report, template, IMarker.SEVERITY_ERROR, "Template cannot specify both name and match attributes");
-//				if (template.getMode() != null)
-//					createMarker(report, template, IMarker.SEVERITY_ERROR, "Named templates cannot specify a mode");
-				checkParameters(report, template);
-			} 
-
-			for (Template checkTemplate : stylesheetComposed.getTemplates())
-			{
-				if (checkTemplate != template && checkTemplate.equals(template))
-				{
-					if (template.getStylesheet() == stylesheetComposed.getStylesheet() && checkTemplate.getStylesheet() == stylesheetComposed.getStylesheet())
-					{// templates in this stylesheet conflict with each other
-						createMarker(report, template, getPreference(ValidationPreferences.TEMPLATE_CONFLICT), Messages.XSLValidator_11);
-					}
-					else if (template.getStylesheet() == stylesheetComposed.getStylesheet())
-					{// template in included stylesheet conflicts with this
-						createMarker(report, template, getPreference(ValidationPreferences.TEMPLATE_CONFLICT), Messages.XSLValidator_12);
-					}
-					else
-					{// templates in included stylesheets conflict with each other
-						createMarker(report, template.getStylesheet(), getPreference(ValidationPreferences.TEMPLATE_CONFLICT), Messages.XSLValidator_13);
-					}
-				}
-			}
-		}
-	}
-
-	private void checkParameters(XSLValidationReport report, Template template) throws MaxErrorsExceededException
-	{
-		List<Parameter> parameters = new ArrayList<Parameter>(template.getParameters());
-		// reverse the parameters order for checking - for duplicate parameters
-		// the first one is valid
-		Collections.reverse(parameters);
-		Set<Parameter> duplicateParameters = new HashSet<Parameter>();
-		// check parameters
-		for (Parameter param : parameters)
-		{
-			if (param.getName() == null)
-			{// name is required
-				createMarker(report, param, getPreference(ValidationPreferences.NAME_ATTRIBUTE_MISSING), Messages.XSLValidator_14);
-			}
-			else if (param.getName().trim().length() == 0)
-			{// name value is required
-				createMarker(report, param, getPreference(ValidationPreferences.NAME_ATTRIBUTE_EMPTY), Messages.XSLValidator_15);
-			}
-			else if (duplicateParameters.contains(param))
-			{// don't recheck the parameter
-				continue;
-			}
-			else
-			{// check a parameter with the same name does not exist
-				for (Parameter checkParam : parameters)
-				{
-					if (param != checkParam)
-					{
-						if (param.getName().equals(checkParam.getName()))
-						{
-							duplicateParameters.add(checkParam);
-							createMarker(report, param, getPreference(ValidationPreferences.DUPLICATE_PARAMETER), Messages.XSLValidator_16);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private void checkCallTemplates(StylesheetModel stylesheetComposed, XSLValidationReport report) throws MaxErrorsExceededException
-	{
-		for (CallTemplate calledTemplate : stylesheetComposed.getStylesheet().getCalledTemplates())
-		{
-			if (calledTemplate.getName() != null)
-			{
-				// get the list of templates that might be being called by this
-				// template call
-				List<Template> templateList = stylesheetComposed.getTemplatesByName(calledTemplate.getName());
-				if (templateList.size() == 0)
-				{
-					Object[] messageArgs = { calledTemplate.getName() };
-					createMarker(report, calledTemplate.getAttribute("name"), getPreference(ValidationPreferences.CALL_TEMPLATES), MessageFormat.format(Messages.XSLValidator_18, messageArgs)); //$NON-NLS-1$
-				}
-				else
-				{
-					Template namedTemplate = templateList.get(0);
-					for (Parameter calledTemplateParam : calledTemplate.getParameters())
-					{
-						boolean found = false;
-						for (Parameter namedTemplateParam : namedTemplate.getParameters())
-						{
-							if (calledTemplateParam.getName().equals(namedTemplateParam.getName()))
-							{
-								found = true;
-								if (!namedTemplateParam.isValue() && !calledTemplateParam.isValue()) {
-								    Object[] messageArgs = { calledTemplateParam.getName() };	
-									createMarker(report, calledTemplateParam, getPreference(ValidationPreferences.EMPTY_PARAM), MessageFormat.format(Messages.XSLValidator_20, messageArgs));
-								}
-								break;
-								
-							}
-						}
-						if (!found) {
-							Object[] messageArgs = { calledTemplateParam.getName() };
-							createMarker(report, calledTemplateParam.getAttribute("name"), getPreference(ValidationPreferences.MISSING_PARAM), MessageFormat.format(Messages.XSLValidator_22, messageArgs)); //$NON-NLS-1$
-						}
-					}
-					if (getPreference(ValidationPreferences.MISSING_PARAM) > IMarker.SEVERITY_INFO)
-					{
-						for (Parameter namedTemplateParam : namedTemplate.getParameters())
-						{
-							if (!namedTemplateParam.isValue())
-							{
-								boolean found = false;
-								for (Parameter calledTemplateParam : calledTemplate.getParameters())
-								{
-									if (calledTemplateParam.getName().equals(namedTemplateParam.getName()))
-									{
-										found = true;
-										break;
-									}
-								}
-								if (!found) {
-									Object[] messageArgs = { namedTemplateParam.getName() };
-									createMarker(report, calledTemplate, getPreference(ValidationPreferences.MISSING_PARAM), MessageFormat.format(Messages.XSLValidator_3, messageArgs));
-								}
-							}
-						}
-					}
-				} 
-			}
-		}
-	}
-
-	private void createMarker(XSLValidationReport report, XSLNode xslNode, int severity, String message) throws MaxErrorsExceededException
-	{
-		if (severity > IMarker.SEVERITY_INFO)
-		{
-			if (report.getErrors().size() + report.getWarnings().size() > getPreference(ValidationPreferences.MAX_ERRORS))
-				throw new MaxErrorsExceededException();
-			switch (severity)
-			{
-				case IMarker.SEVERITY_ERROR:
-					report.addError(xslNode, message);
-					break;
-				case IMarker.SEVERITY_WARNING:
-					report.addWarning(xslNode, message);
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Get the singleton XSLValidator instance.
-	 * 
-	 * @return the singleton XSLValidator instance
-	 */
-	public static XSLValidator getInstance()
-	{
-		if (instance == null)
-			instance = new XSLValidator();
-		return instance;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/eclipse/Validator.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/eclipse/Validator.java
deleted file mode 100644
index 8b98367..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/eclipse/Validator.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
- *     David Carver - STAR - bug 224777 - fix spaces in path names in URIs.
- *                           bug 226578 - remove extraneous @override statements
- *                                        this was causing compilation problems
- *                                        
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.internal.validation.eclipse;
-
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.ValidatorMessage;
-import org.eclipse.wst.validation.internal.ResourceUnavailableError;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.plugin.ValidationPlugin;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.xml.core.internal.validation.core.AbstractNestedValidator;
-import org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.XSLCorePlugin;
-import org.eclipse.wst.xsl.core.internal.validation.XSLValidationMessage;
-import org.eclipse.wst.xsl.core.internal.validation.XSLValidator;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.eclipse.wst.xsl.core.model.XSLAttribute;
-import org.eclipse.wst.xsl.core.model.XSLNode;
-
-/**
- * The XSL validator extends the XML <code>AbstractNestedValidator</code>.
- * 
- * @author Doug Satchwell
- */
-public class Validator extends AbstractNestedValidator
-{
-	// ////////////////////////////////////////////////////////////////////////////////////////////////
-	// BUILD VALIDATION METHODS
-	// ////////////////////////////////////////////////////////////////////////////////////////////////
-
-	private boolean asYouTypeValidation;
-
-	@Override
-	public void clean(IProject project, ValidationState state, IProgressMonitor monitor)
-	{
-		super.clean(project, state, monitor);
-		XSLCore.getInstance().clean(project,monitor);
-	}
-	
-	@Override
-	public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor)
-	{
-		ValidationResult res = super.validate(resource, kind, state, monitor);
-		if (resource.getType() == IResource.FILE)
-		{
-			StylesheetModel stylesheet = XSLCore.getInstance().getStylesheet((IFile) resource);
-			IFile[] dependencies = stylesheet.getFileDependencies().toArray(new IFile[0]);
-			res.setDependsOn(dependencies);
-		}
-		return res;
-	} 
-
-	
-	// ////////////////////////////////////////////////////////////////////////////////////////////////
-	// AS YOU TYPE VALIDATION METHODS
-	// ////////////////////////////////////////////////////////////////////////////////////////////////
-
-	public IStatus validateInJob(IValidationContext context, IReporter reporter) throws ValidationException
-	{
-		asYouTypeValidation = true;
-		return super.validateInJob(context, reporter);
-	}
-
-	// ////////////////////////////////////////////////////////////////////////////////////////////////
-	// COMMON METHODS
-	// ////////////////////////////////////////////////////////////////////////////////////////////////
-
-	public ValidationReport validate(final String uri, InputStream inputstream, NestedValidatorContext context)
-	{
-		ValidationReport valreport = new ValidationReport(){
-
-			public String getFileURI()
-			{
-				return uri;
-			}
-
-			@SuppressWarnings("unchecked")
-			public HashMap getNestedMessages()
-			{
-				return new HashMap();
-			}
-
-			public ValidationMessage[] getValidationMessages()
-			{
-				return new ValidationMessage[0];
-			}
-
-			public boolean isValid()
-			{
-				return true;
-			}};
-		try
-		{
-			String encUri = URIEncoder.encode(uri);
-			IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocationURI(new URI(encUri));
-			if (files.length > 0)
-			{
-				IFile xslFile = files[0];
-				valreport = XSLValidator.getInstance().validate(xslFile,asYouTypeValidation);
-			}
-		}
-		catch (URISyntaxException e)
-		{
-			XSLCorePlugin.log(e);
-		}
-		catch (CoreException e)
-		{
-			XSLCorePlugin.log(e);
-		}
-		return valreport;
-	}
-
-	@Override
-	protected void addInfoToMessage(ValidationMessage validationMessage, IMessage message)
-	{
-		XSLValidationMessage msg = (XSLValidationMessage) validationMessage;
-		XSLNode node = msg.getNode();
-		// set this here as it gets set to the wrong value by the superclass
-		message.setSeverity(msg.getRealSeverity());
-		// constants are defined in org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidator
-		if (node.getNodeType() == XSLNode.ATTRIBUTE_NODE)
-		{
-			message.setAttribute("ERROR_SIDE", "ERROR_SIDE_RIGHT");  //$NON-NLS-1$//$NON-NLS-2$
-			message.setAttribute(COLUMN_NUMBER_ATTRIBUTE, new Integer(validationMessage.getColumnNumber()));
-			message.setAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE, "ATTRIBUTE_VALUE"); // whether to squiggle the element, attribute or text //$NON-NLS-1$
-			message.setAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE, ((XSLAttribute) node).getName());
-		}
-		else if (node.getNodeType() == XSLNode.ELEMENT_NODE)
-		{
-			message.setAttribute("ERROR_SIDE", "ERROR_SIDE_RIGHT");  //$NON-NLS-1$//$NON-NLS-2$
-			message.setAttribute(COLUMN_NUMBER_ATTRIBUTE, new Integer(validationMessage.getColumnNumber()));
-			message.setAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE, "START_TAG"); // whether to squiggle the element, attribute or text //$NON-NLS-1$
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/eclipse/Validator2.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/eclipse/Validator2.java
deleted file mode 100644
index 8c8c7a2..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/validation/eclipse/Validator2.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.eclipse.wst.xsl.core.internal.validation.eclipse;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.ValidatorMessage;
-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.IValidatorJob;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.XSLCorePlugin;
-import org.eclipse.wst.xsl.core.internal.validation.XSLValidationMessage;
-import org.eclipse.wst.xsl.core.internal.validation.XSLValidator;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-
-/**
- * Validator for both build validation (AbstractValidator) and as-you-type validation (IValidatorJob).
- * 
- * @author Doug
- */
-public class Validator2 extends AbstractValidator implements IValidatorJob
-{
-	// ////////////////////////////////////////////////////////////////////////////////////////////////
-	// BUILD VALIDATION METHODS
-	// ////////////////////////////////////////////////////////////////////////////////////////////////
-
-	@Override
-	public void clean(IProject project, ValidationState state, IProgressMonitor monitor)
-	{
-		XSLCore.getInstance().clean(project, monitor);
-		super.clean(project, state, monitor);
-	}
-
-	public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor)
-	{
-		/*
-		 * String s; switch(kind) { case IResourceDelta.ADDED: s = "added"; break; case IResourceDelta.CHANGED: s = "CHANGED"; break; case IResourceDelta.CONTENT: s = "CONTENT"; break; case
-		 * IResourceDelta.REMOVED: s = "REMOVED"; break; default: s = "other"; } System.out.println(s);
-		 */
-		ValidationResult result = new ValidationResult();
-		if (resource.getType() == IResource.FILE)
-		{
-			IFile file = (IFile)resource;
-			ValidationReport report = doValidation(file, kind, state, monitor);
-			StylesheetModel stylesheet = XSLCore.getInstance().getStylesheet(file);
-			IFile[] dependencies = stylesheet.getFileDependencies().toArray(new IFile[0]);
-			result.setDependsOn(dependencies);
-			
-			for (ValidationMessage message : report.getValidationMessages())
-			{
-				XSLValidationMessage xslMsg = (XSLValidationMessage)message;
-				ValidatorMessage msg = ValidatorMessage.create(message.getMessage(), resource);
-				msg.setAttribute("lineNumber", xslMsg.getLineNumber());
-				msg.setAttribute("severity", xslMsg.getSeverity());
-				result.add(msg);
-			}
-		}
-		return result;
-	}
-
-	private ValidationReport doValidation(IFile file, int kind, ValidationState state, IProgressMonitor monitor)
-	{
-		ValidationReport valreport = null;
-		try
-		{
-			valreport = XSLValidator.getInstance().validate(file,true);
-		}
-		catch (CoreException e)
-		{
-			XSLCorePlugin.log(e);
-		}
-		return valreport;
-	}
-
-	// ////////////////////////////////////////////////////////////////////////////////////////////////
-	// AS YOU TYPE VALIDATION METHODS
-	// ////////////////////////////////////////////////////////////////////////////////////////////////
-
-	public ISchedulingRule getSchedulingRule(IValidationContext helper)
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public IStatus validateInJob(IValidationContext helper, IReporter reporter) throws ValidationException
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void cleanup(IReporter reporter)
-	{
-		// TODO Auto-generated method stub
-
-	}
-
-	public void validate(IValidationContext helper, IReporter reporter) throws ValidationException
-	{
-		validateInJob(helper,reporter);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/xinclude/XIncluder.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/xinclude/XIncluder.java
deleted file mode 100644
index c2d83ce..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/internal/xinclude/XIncluder.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************

-* Copyright (c) 2008 Lars Vogel 

-* All rights reserved. This program and the accompanying materials

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

-* which accompanies this distribution, and is available at

-* http://www.eclipse.org/legal/eplv10.html

-*

-* Contributors:

-* Lars Vogel - Lars.Vogel@gmail.com - initial API and implementation

-* David Carver - STAR - bug 217919 - renamed to XIncluder from MyXIncluder

-*                                    Added feature call to make sure we get

-*                                    an XInclude aware configuration.  Also

-*                                    removed Docbook DTD hard coding.

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

-

-package org.eclipse.wst.xsl.core.internal.xinclude;

-

-import java.io.File;

-import java.io.FileOutputStream;

-

-import javax.xml.parsers.DocumentBuilder;

-import javax.xml.parsers.DocumentBuilderFactory;

-import javax.xml.transform.Transformer;

-import javax.xml.transform.TransformerFactory;

-import javax.xml.transform.dom.DOMSource;

-import javax.xml.transform.stream.StreamResult;

-

-import org.w3c.dom.Document;

-

-/**

- * XIncluder will read an XML file, that has elements from the XInclude

- * namespace and follows the W3C XInclude specification (http://www.w3.org/TR/xinclude/).

- * It will output a merged file.

- * @author Lars Vogel

- *

- */

-public class XIncluder {

-

-	/**

-	 * extracXMLFile merges the files referenced by xinclude include elements.

-	 * @param in  The full path to the input XML file

-	 * @param out The full path to the merged XML file

-	 * @throws Exception

-	 */

-	public void extractXMLFile(String in, String out) throws Exception {

-		Document document = null;

-		File file;

-

-		file = new File(in);

-		file.getAbsolutePath();

-		file.lastModified();

-		

-		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();

-		

-		// Make sure we are getting a configuration that is XInclude Aware

-		dbf.setAttribute("http://apache.org/xml/features/xinclude", true); //$NON-NLS-1$

-		dbf.setXIncludeAware(true);

-		dbf.setNamespaceAware(true);

-

-		

-		DocumentBuilder dom = dbf.newDocumentBuilder();

-		document = dom.parse(file);

-		

-		// ---- Use a XSLT transformer for writing the new XML file ----

-		Transformer transformer = TransformerFactory.newInstance()

-				.newTransformer();

-		

-		DOMSource source = new DOMSource(document);

-		FileOutputStream os = new FileOutputStream(new File(out));

-		StreamResult result = new StreamResult(os);

-		transformer.transform(source, result);

-	}

-}

diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/messages.properties b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/messages.properties
deleted file mode 100644
index c55859e..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/messages.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jesper Steen Møller - adapted from org.eclipse.core.internal.content 
-###############################################################################
-
-### Resolver problems
-XSLCorePlugin_badInitializationData = Invalid initialization data for "{0}".
-XSLCorePlugin_parserConfiguration = XSL parser configuration error during content description.
-XSLCorePlugin_coreError=Error logged from XSL core plug-in\:
-# XInclude
-XIncludeTask_0=Setting the output File to: 
-XIncludeTask_1=Setting the output File to: 
-XIncludeTask_2=Executing the XIncludeTask
-XIncludeTask_3=Specified Inputfile does not exists 
-XIncludeTask_4=Creating the output directory 
-XIncludeTask_5=Could not create outputfile
-XIncludeTask_6=Changes detected. Creating a new output file
-XIncludeTask_7=Problems with accessing the files.
-XIncludeTask_8=Please specify inputfile 
-XIncludeTask_9=Please specify outputfile  
-# Validation
-XSLValidator_1=Xpath is invalid
-XSLValidator_10=A stylesheet must not import itself
-XSLValidator_11=Template conflicts with another template in this stylesheet
-XSLValidator_12=Template conflicts with an included template
-XSLValidator_13=Included templates conflict with each other
-XSLValidator_14=Name attribute is required
-XSLValidator_23=href attribute is required
-XSLValidator_15=Name must be specified
-XSLValidator_16=Parameter already defined
-XSLValidator_18=Named template {0} is not available
-XSLValidator_2=Included stylesheets form a circular reference
-XSLValidator_20=Parameter {0} does not have a default value
-XSLValidator_22=Parameter {0} does not exist
-XSLValidator_3=Missing parameter: {0}
-XSLValidator_4=Missing include: 
-XSLValidator_6=A stylesheet must not include itself
-XSLValidator_8=Missing import: 
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/CallTemplate.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/CallTemplate.java
deleted file mode 100644
index 083b8e3..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/CallTemplate.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.core.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.xsl.core.model.XSLModelObject.Type;
-
-/**
- * The <code>xsl:call-template</code> model element.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class CallTemplate extends XSLElement
-{
-	final List<Parameter> parameters = new ArrayList<Parameter>();
-	
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param stylesheet the stylesheet that this belongs to
-	 */
-	public CallTemplate(Stylesheet stylesheet)
-	{
-		super(stylesheet);
-	}
-	
-	/**
-	 * Add a parameter to this.
-	 * 
-	 * @param parameter the parameter to add
-	 */
-	public void addParameter(Parameter parameter)
-	{
-		parameters.add(parameter);
-	}
-
-	/**
-	 * Get the value of the <code>name</code> attribute if one exists.
-	 * 
-	 * @return the template name, or null
-	 */
-	public String getName()
-	{
-		return getAttributeValue("name"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Get the list of parameters associated with this.
-	 * 
-	 * @return a list of parameters
-	 */
-	public List<Parameter> getParameters()
-	{
-		return parameters;
-	}
-	
-	public Type getModelType()
-	{
-		return Type.CALL_TEMPLATE;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Import.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Import.java
deleted file mode 100644
index 9369dde..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Import.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.core.model;
-
-/**
- * The <code>xsl:import</code> model element.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class Import extends Include
-{
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param stylesheet the stylesheet that this belongs to
-	 */
-	public Import(Stylesheet stylesheet)
-	{
-		super(stylesheet,IMPORT);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Include.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Include.java
deleted file mode 100644
index ffacf15..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Include.java
+++ /dev/null
@@ -1,92 +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.core.model;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.xsl.core.XSLCore;
-
-/**
- * The <code>xsl:include</code> model element.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class Include extends XSLElement
-{
-	/**
-	 * Constant indicating that this is an <code>Include</code>.
-	 */
-	public static final int INCLUDE = 1;
-	
-	/**
-	 * Constant indicating that this is an <code>Import</code>.
-	 */
-	public static final int IMPORT = 2;
-	
-	private final int type;
-	
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param stylesheet the stylesheet that this belongs to
-	 */
-	public Include(Stylesheet stylesheet)
-	{
-		this(stylesheet,INCLUDE);
-	}
-
-	/**
-	 * Create a new instance of this, specifying whether an <code>Include</code> or an <code>Import</code>.
-	 * 
-	 * @param stylesheet the stylesheet that this belongs to
-	 * @param type one of the constants <code>INCLUDE</code> or <code>IMPORT</code>
-	 */
-	protected Include(Stylesheet stylesheet, int type)
-	{
-		super(stylesheet);
-		this.type = type;
-	}
-	
-	/**
-	 * Get the type of include, whether an <code>Include</code> or an <code>Import</code>.
-	 * 
-	 * @return one of the constants <code>INCLUDE</code> or <code>IMPORT</code>
-	 */
-	public int getIncludeType()
-	{
-		return type;
-	}
-	
-	/**
-	 * Get the value of the <code>href</code> attribute if one exists.
-	 * 
-	 * @return the <code>href</code> value, or null
-	 */
-	public String getHref() {
-		return getAttributeValue("href"); //$NON-NLS-1$
-	}
-	
-
-	/**
-	 * Gets the included file as a source file, if possible (returned file may be null and need not exist).
-	 * 
-	 * @return the included file, or null
-	 */
-	public IFile getHrefAsFile()
-	{
-		return XSLCore.resolveFile(getStylesheet().getFile(), getHref());
-	}
-
-	public Type getModelType()
-	{
-		return Type.INCLUDE;
-	} 
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Parameter.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Parameter.java
deleted file mode 100644
index a8d92a9..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Parameter.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.core.model;
-
-/**
- * The <code>xsl:parameter</code> or <code>xsl:with-param</code> model element.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class Parameter extends Variable
-{
-	private boolean valueSet;
-
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param stylesheet the stylesheet that this belongs to
-	 */
-	public Parameter(Stylesheet stylesheet)
-	{
-		super(stylesheet);
-	}
-	
-	/**
-	 * Set whether this has a value.
-	 * 
-	 * @param valueSet <code>true</code> if this has a value
-	 */
-	public void setValue(boolean valueSet)
-	{
-		this.valueSet = valueSet;
-	}
-
-	/**
-	 * Get whether this has a value.
-	 * 
-	 * @return <code>true</code> if this has a value
-	 */
-	public boolean isValue()
-	{
-		if (valueSet)
-			return true;
-		if (getAttributeValue("select") != null) //$NON-NLS-1$
-			return true;
-		return false; 
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Stylesheet.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Stylesheet.java
deleted file mode 100644
index 1ba11c6..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Stylesheet.java
+++ /dev/null
@@ -1,179 +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.core.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-
-/**
- * The <code>xsl:stylesheet</code> model element.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class Stylesheet extends XSLElement
-{
-	final IFile file;
-	final List<Include> includes = new ArrayList<Include>();
-	final List<Import> imports = new ArrayList<Import>();
-	final List<Template> templates = new ArrayList<Template>();
-	final List<CallTemplate> calledTemplates = new ArrayList<CallTemplate>();
-	final List<Variable> globalVariables = new ArrayList<Variable>();
-	final List<XSLElement> elements = new ArrayList<XSLElement>();
-	String version;
-
-	/**
-	 * Create an instance of this.
-	 * 
-	 * @param file the file that this represents
-	 */
-	public Stylesheet(IFile file)
-	{
-		super(null);
-		this.file = file;
-	}
-	
-	@Override
-	public Stylesheet getStylesheet()
-	{
-		return this;
-	}
-
-	/**
-	 * Add an <code>Include</code> to this.
-	 * 
-	 * @param include the include to add
-	 */
-	public void addInclude(Include include)
-	{
-		includes.add(include);
-	}
-
-	/**
-	 * Add an <code>Import</code> to this.
-	 * 
-	 * @param include the import to add
-	 */
-	public void addImport(Import include)
-	{
-		imports.add(include);
-	}
-
-	/**
-	 * Add a <code>Template</code> to this.
-	 * 
-	 * @param template the template to add
-	 */
-	public void addTemplate(Template template)
-	{
-		templates.add(template);
-	}
-
-	/**
-	 * Add a <code>CallTemplate</code> to this.
-	 * 
-	 * @param template the template to add
-	 */
-	public void addCalledTemplate(CallTemplate template)
-	{
-		calledTemplates.add(template);
-	}
-
-	/**
-	 * Get the file that this represents.
-	 * 
-	 * @return the file that this represents
-	 */
-	public IFile getFile()
-	{
-		return file;
-	}
-
-	/**
-	 * Get the list of includes for this.
-	 * 
-	 * @return the list of includes
-	 */
-	public List<Include> getIncludes()
-	{
-		return includes;
-	}
-	
-	/**
-	 * Get the list of imports for this.
-	 * 
-	 * @return the list of imports
-	 */
-	public List<Import> getImports()
-	{
-		return imports;
-	}
-
-	/**
-	 * Get the list of templates for this.
-	 * 
-	 * @return the list of templates
-	 */
-	public List<Template> getTemplates()
-	{
-		return templates;
-	}
-
-	/**
-	 * Get the list of called templates for this.
-	 * 
-	 * @return the list of called templates
-	 */
-	public List<CallTemplate> getCalledTemplates()
-	{
-		return calledTemplates;
-	}
-
-	/**
-	 * Add a global variable to this.
-	 * 
-	 * @param var the variable to add
-	 */
-	public void addGlobalVariable(Variable var)
-	{
-		globalVariables.add(var);
-	}
-	
-	public Type getModelType()
-	{
-		return Type.STYLESHEET;
-	}
-
-	/**
-	 * Set the stylesheet version.
-	 * 
-	 * @param version the version to set
-	 */
-	public void setVersion(String version)
-	{
-		this.version = version;
-	}
-
-	/**
-	 * Get the stylesheet version.
-	 */
-	public String getVersion()
-	{
-		return version;
-	}
-
-	public List<Variable> getGlobalVariables()
-	{
-		return globalVariables;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/StylesheetModel.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/StylesheetModel.java
deleted file mode 100644
index 671bb73..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/StylesheetModel.java
+++ /dev/null
@@ -1,258 +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 243577 - Added retrieving all called-templates.
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.model;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.util.Debug;
-
-/**
- * The composed stylesheet, consisting of all templates and variables available via imports and includes.
- * 
- * <p>
- * The <code>fix()</code> method does the actual work of populating the fields of this, so it must be called before calling any of the other methods.
- * </p>
- * 
- * <p>
- * Note that this model may not be valid - for instance there may be more than one named template for a given name or more than one global variable with a given name.
- * </p>
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class StylesheetModel extends XSLModelObject
-{
-	private final Stylesheet stylesheet;
-	boolean circularReference;
-	final Set<IFile> files = new HashSet<IFile>();
-	final Set<Stylesheet> stylesheets = new HashSet<Stylesheet>();
-	final List<Include> includeModel = new ArrayList<Include>();
-	final List<Import> importModel = new ArrayList<Import>();
-	final Set<Template> templateSet = new HashSet<Template>();
-	final List<Template> templates = new ArrayList<Template>();
-	final List<Variable> globalVariables = new ArrayList<Variable>();
-	final List<CallTemplate> callTemplates = new ArrayList<CallTemplate>();
-
-
-
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param stylesheet
-	 *            the stylesheet that this is the model for
-	 */
-	public StylesheetModel(Stylesheet stylesheet)
-	{
-		this.stylesheet = stylesheet;
-	}
-
-	/**
-	 * Get all stylesheets that are included in this stylesheet anywhere in the hierarchy via either import or include.
-	 * 
-	 * @return the set of stylesheets in the entire hierarchy
-	 */
-	public List<Include> getIncludes()
-	{
-		return includeModel;
-	}
-
-	/**
-	 * Get all files that are included in this stylesheet anywhere in the hierarchy via either import or include.
-	 * 
-	 * @return the set of files in the entire hierarchy
-	 */
-	public Set<IFile> getFileDependencies()
-	{
-		return files;
-	}
-
-	/**
-	 * Get the stylesheet that this is the model for.
-	 * 
-	 * @return the stylesheet that this is the model for
-	 */
-	public Stylesheet getStylesheet()
-	{
-		return this.stylesheet;
-	}
-
-	/**
-	 * Get all global variables that are included in this stylesheet anywhere in the hierarchy via either import or include.
-	 * 
-	 * @return the set of files in the entire hierarchy
-	 */
-	public List<Variable> getGlobalVariables()
-	{
-		return globalVariables;
-	}
-
-	/**
-	 * Get all templates that are included in this stylesheet anywhere in the hierarchy via either import or include.
-	 * 
-	 * @return the set of templates in the entire hierarchy
-	 */
-	public List<Template> getTemplates()
-	{
-		return templates;
-	}
-	
-	/**
-	 * A utility method that traverses all stylesheet in the hierarchy of stylesheets (not including the current stylesheet), and adds all their templates to the returned list.
-	 * Therefore the returned list has no regard for whether a template is 'visible' (i.e. whether it might be overridden since it 
-	 * was included via an import). The order of the templates in the list is arbitrary.
-	 * 
-	 * @return an unordered list of all templates from all stylesheets.
-	 */
-	public List<Template> findAllNestedTemplates()
-	{
-		List<Template> allTemplates = new ArrayList<Template>();
-		for (Stylesheet stylesheet : stylesheets)
-		{
-			allTemplates.addAll(stylesheet.getTemplates());
-		}
-		return allTemplates;
-	}
-
-	/**
-	 * Get all named templates that are included in this stylesheet anywhere in the hierarchy via either import or include which have the given name.
-	 * 
-	 * @param name
-	 *            the template name
-	 * @return the set of named templates with the given name
-	 */
-	public List<Template> getTemplatesByName(String name)
-	{
-		List<Template> matching = new ArrayList<Template>(templates.size());
-		for (Template template : templates)
-		{
-			if (name.equals(template.getName()))
-				matching.add(template);
-		}
-		return matching;
-	}
-
-	/**
-	 * Get all templates that match the given template (determined from <code>Template.equals()</code>).
-	 * 
-	 * @param toMatch
-	 *            the template to match
-	 * @return the set of templates that match
-	 */
-	public List<Template> findMatching(Template toMatch)
-	{
-		List<Template> matching = new ArrayList<Template>(templates.size());
-		for (Template template : templates)
-		{
-			if (template.equals(toMatch))
-				matching.add(template);
-		}
-		return matching;
-	}
-
-	/**
-	 * Get whether this has a circular reference anywhere in its import/included hierarchy.
-	 * 
-	 * @return <code>true</code> if this has a circular reference
-	 */
-	public boolean hasCircularReference()
-	{
-		return circularReference;
-	}
-
-	/**
-	 * Perform the process of traversing the hierarchy to determine all of the properties of this. Note that this method may force other <code>StylesheetModel</code>'s to be built during the process
-	 * of fixing.
-	 */
-	public void fix()
-	{
-		long start = System.currentTimeMillis();
-
-		if (Debug.debugXSLModel)
-		{
-			System.out.println("Fixing " + stylesheet.getFile() + "...");
-		}
-		templates.addAll(stylesheet.getTemplates());
-		templateSet.addAll(stylesheet.getTemplates());
-		globalVariables.addAll(stylesheet.globalVariables);
-		callTemplates.addAll(stylesheet.getCalledTemplates());
-		for (Include inc : stylesheet.getIncludes())
-		{
-			handleInclude(inc);
-		}
-		for (Import inc : stylesheet.getImports())
-		{
-			handleInclude(inc);
-		}
-		if (Debug.debugXSLModel)
-		{
-			long end = System.currentTimeMillis();
-			System.out.println("FIX " + stylesheet.getFile() + " in " + (end - start) + "ms");
-		}
-	}
-
-	private void handleInclude(Include include)
-	{
-		IFile file = include.getHrefAsFile();
-
-		if (file == null || !file.exists())
-		{
-			return;
-		}
-		else if (stylesheet.getFile().equals(file) || files.contains(file))
-		{
-			circularReference = true;
-			return;
-		}
-		files.add(file);
-
-		StylesheetModel includedModel = XSLCore.getInstance().getStylesheet(file);
-		if (includedModel == null)
-			return;
-		stylesheets.add(includedModel.getStylesheet());
-		globalVariables.addAll(includedModel.globalVariables);
-		callTemplates.addAll(includedModel.getCallTemplates());
-
-		if (include.getIncludeType() == Include.INCLUDE)
-		{
-			includeModel.add(include);
-			templates.addAll(includedModel.getTemplates());
-			templateSet.addAll(includedModel.getTemplates());
-		}
-		else
-		{
-			importModel.add((Import)include);
-			for (Template includedTemplate : includedModel.getTemplates())
-			{
-				if (!templateSet.contains(includedTemplate))
-				{
-					templates.add(includedTemplate);
-					templateSet.add(includedTemplate);
-				}
-			}
-		}
-	}
-	
-	public Type getModelType()
-	{
-		return Type.STYLESHEET_MODEL;
-	}
-	
-	public List<CallTemplate> getCallTemplates() {
-		return callTemplates;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Template.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Template.java
deleted file mode 100644
index 6d200c4..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Template.java
+++ /dev/null
@@ -1,182 +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.core.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.xsl.core.model.XSLModelObject.Type;
-
-/**
- * The <code>xsl:template</code> model element.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class Template extends XSLElement
-{
-	final List<Variable> variables = new ArrayList<Variable>();
-	final List<Parameter> parameters = new ArrayList<Parameter>();
-	
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param stylesheet the stylesheet that this belongs to
-	 */
-	public Template(Stylesheet stylesheet)
-	{
-		super(stylesheet);
-	}
-	
-	/**
-	 * Add a parameter to this.
-	 * 
-	 * @param parameter the parameter to add
-	 */
-	public void addParameter(Parameter parameter)
-	{
-		parameters.add(parameter);
-	}
-	
-	/**
-	 * Add a variable to this.
-	 * 
-	 * @param var the variable to add
-	 */
-	public void addVariable(Variable var)
-	{
-		variables.add(var);
-	}
-
-	/**
-	 * Get the value of the <code>name</code> attribute if one exists.
-	 * 
-	 * @return the template name, or null
-	 */
-	public String getName()
-	{
-		return getAttributeValue("name"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Get the value of the <code>match</code> attribute if one exists.
-	 * 
-	 * @return the match value, or null
-	 */
-	public String getMatch()
-	{
-		return getAttributeValue("match"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Get the value of the <code>mode</code> attribute if one exists.
-	 * 
-	 * @return the mode value, or null
-	 */
-	public String getMode()
-	{
-		return getAttributeValue("mode"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Get the value of the <code>priority</code> attribute if one exists.
-	 * 
-	 * @return the priority value, or null
-	 */
-	public String getPriority()
-	{
-		return getAttributeValue("priority"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the list of parameters of this.
-	 * 
-	 * @return the list of parameters
-	 */
-	public List<Parameter> getParameters()
-	{
-		return parameters;
-	}
-	
-	@Override
-	public int hashCode()
-	{
-		String name = getName();
-		if (name != null)
-		{
-			return 3 + name.hashCode();
-		}
-		String match = getMatch();
-		String mode = getMode();
-		String priority = getPriority();
-		if (match != null)
-		{
-			int hash = 3*match.hashCode();
-			if (priority != null)
-				hash += 5*priority.hashCode();
-			if (mode != null)
-				hash += 7*mode.hashCode();
-			return 5 + hash;
-		}
-		return super.hashCode();
-	}
-	
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (obj == null)
-			return false;
-		if (obj == this)
-			return true;
-		if (obj instanceof Template)
-		{
-			Template includedTemplate = (Template)obj;
-			if (!matchesByMatchOrName(includedTemplate))
-				return false;
-			// only possibility is that priority is different
-			String priority1 = getPriority();
-			String priority2 = includedTemplate.getPriority();
-			if (priority1 == null && priority2 == null || priority1 != null && priority1.equals(priority2))
-				return true;
-		}
-		return false;
-	}
-	
-	public boolean matchesByMatchOrName(Template includedTemplate)
-	{
-		String name1 = getName();
-		String match1 = getMatch();
-		String mode1 = getMode();
-		String name2 = includedTemplate.getName();
-		String match2 = includedTemplate.getMatch();
-		String mode2 = includedTemplate.getMode();
-		if (name1 != null && name1.equals(name2))
-			return true;
-		if (match1 != null && match1.equals(match2) && (mode1 == null && mode2 == null || mode1 != null && mode1.equals(mode2)))
-			return true;
-		return false;
-	}
-	
-	
-	@Override
-	public String toString()
-	{
-		String name = getName();
-		String match = getMatch();
-		return "file="+getStylesheet().getFile()+", name="+name+", match="+match; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	public Type getModelType()
-	{
-		return Type.TEMPLATE;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Variable.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Variable.java
deleted file mode 100644
index 5e34b11..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/Variable.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.model;
-
-import org.eclipse.wst.xsl.core.model.XSLModelObject.Type;
-
-/**
- * The <code>xsl:variable</code> model element.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class Variable extends XSLElement
-{
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param stylesheet the stylesheet that this belongs to
-	 */
-	public Variable(Stylesheet stylesheet)
-	{
-		super(stylesheet);
-	}
-
-	/**
-	 * Get the value of the <code>name</code> attribute if one exists.
-	 * 
-	 * @return the variable name, or null
-	 */
-	public String getName()
-	{
-		return getAttributeValue("name"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Get the value of the <code>select</code> attribute if one exists.
-	 * 
-	 * @return the select value, or null
-	 */
-	public String getSelect()
-	{
-		return getAttributeValue("select"); //$NON-NLS-1$
-	}
-	
-	public Type getModelType()
-	{
-		return Type.VARIABLE;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLAttribute.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLAttribute.java
deleted file mode 100644
index 0725daf..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLAttribute.java
+++ /dev/null
@@ -1,62 +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.core.model;
-
-/**
- * An attribute of an element in the XSL namespace.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class XSLAttribute extends XSLNode
-{
-	final String name;
-	final String value;
-
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param element the element this belongs to
-	 * @param name the name of the attribute
-	 * @param value the value of the attribute
-	 */
-	public XSLAttribute(XSLElement element, String name, String value)
-	{
-		super(element.getStylesheet(), XSLNode.ATTRIBUTE_NODE);
-		this.name = name;
-		this.value = value;
-	}
-	
-	/**
-	 * Get the name of this.
-	 * 
-	 * @return the attribute's name
-	 */
-	public String getName()
-	{
-		return name;
-	}
-	
-	/**
-	 * Get the value of this.
-	 * 
-	 * @return the attribute's value
-	 */
-	public String getValue()
-	{
-		return value;
-	}
-	
-	public Type getModelType()
-	{
-		return Type.ATTRIBUTE;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLElement.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLElement.java
deleted file mode 100644
index cd386b0..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLElement.java
+++ /dev/null
@@ -1,107 +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.core.model;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * An element in the XSL namespace.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class XSLElement extends XSLNode
-{
-	final Map<String, XSLAttribute> attributes = new HashMap<String, XSLAttribute>();
-	final List<XSLElement> childElements = new ArrayList<XSLElement>();
-	
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param stylesheet the stylesheet that this belongs to
-	 */
-	public XSLElement(Stylesheet stylesheet)
-	{
-		super(stylesheet, XSLNode.ELEMENT_NODE);
-	}
-	
-	/**
-	 * Add an attribute of this
-	 * 
-	 * @param attribute the attribute to add
-	 */
-	public void setAttribute(XSLAttribute attribute)
-	{
-		attributes.put(attribute.name, attribute);
-	}
-	
-	/**
-	 * Get the attribute with the given name.
-	 * 
-	 * @param name the name of the attribute
-	 * @return the attribute
-	 */
-	public XSLAttribute getAttribute(String name)
-	{
-		return attributes.get(name);
-	}
-
-	/**
-	 * Get the attributes keyed by their names. 
-	 * 
-	 * @return the map of attribute names and instances
-	 */
-	public Map<String, XSLAttribute> getAttributes()
-	{
-		return attributes;
-	}
-	
-	/**
-	 * Get the value of the attribute with the given name.
-	 * 
-	 * @param name the name of the attribute
-	 * @return the attribute value
-	 */
-	public String getAttributeValue(String name)
-	{
-		XSLAttribute attribute = attributes.get(name);
-		return attribute == null ? null : attribute.getValue();
-	}
-
-	/**
-	 * Add a child element of this.
-	 * 
-	 * @param element the chold element
-	 */
-	public void addChild(XSLElement element)
-	{
-		childElements.add(element);
-	}
-	
-	/**
-	 * Get the list of child elements
-	 * 
-	 * @return the list of children
-	 */
-	public List<XSLElement> getChildElements()
-	{
-		return childElements;
-	}
-
-	@Override
-	public Type getModelType()
-	{
-		return Type.OTHER_ELEMENT;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLModelObject.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLModelObject.java
deleted file mode 100644
index 8f7b2a5..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLModelObject.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.wst.xsl.core.model;
-
-import org.eclipse.core.runtime.PlatformObject;
-
-/**
- * @author dcarver
- * @since 1.0
- *
- */
-public abstract class XSLModelObject extends PlatformObject
-{
-	public enum Type {STYLESHEET_MODEL,IMPORT,INCLUDE,TEMPLATE,VARIABLE, CALL_TEMPLATE, STYLESHEET, ATTRIBUTE, OTHER_ELEMENT};
-	
-	public abstract Type getModelType();
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLNode.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLNode.java
deleted file mode 100644
index 88e3ebd..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/model/XSLNode.java
+++ /dev/null
@@ -1,160 +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.core.model;
-
-import org.w3c.dom.Node;
-
-/**
- * A node in the XSL namespace.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public abstract class XSLNode extends XSLModelObject
-{
-	/**
-	 * A constant for the element node (= <code>org.w3c.dom.Node.ELEMENT_NODE</code>)
-	 */
-	public static final short ELEMENT_NODE = Node.ELEMENT_NODE;
-	
-	/**
-	 * A constant for the attribute node (= <code>org.w3c.dom.Node.ATTRIBUTE_NODE</code>)
-	 */
-	public static final short ATTRIBUTE_NODE = Node.ATTRIBUTE_NODE;
-	
-	
-	private final Stylesheet stylesheet;
-	int lineNumber;
-	int columnNumber;
-	private int offset;
-	private int length;
-	private short type;
-	private String name;
-	
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param stylesheet the stylesheet this belongs to
-	 * @param type one of <code>ELEMENT_NODE</code> or <code>ATTRIBUTE_NODE</code>
-	 */
-	public XSLNode(Stylesheet stylesheet, short type)
-	{
-		this.stylesheet = stylesheet;
-		this.type = type;
-	}
-
-	/**
-	 * Set the line number where this node occurs in the XSL file.
-	 * 
-	 * @param lineNumber the line number
-	 */
-	public void setLineNumber(int lineNumber)
-	{
-		this.lineNumber = lineNumber;
-	}
-
-	/**
-	 * Set the columns number where this node occurs in the XSL file.
-	 * 
-	 * @param columnNumber the column number
-	 */
-	public void setColumnNumber(int columnNumber)
-	{
-		this.columnNumber = columnNumber;
-	}
-
-	/**
-	 * Get the stylesheet that this belongs to.
-	 * 
-	 * @return the stylesheet
-	 */
-	public Stylesheet getStylesheet()
-	{
-		return stylesheet;
-	}
-
-	/**
-	 * Set the line number where this node occurs in the XSL file.
-	 * @return the line number where this node occurs in the XSL file.
-	 */
-	public int getLineNumber()
-	{
-		return lineNumber;
-	}
-
-	/**
-	 * Set the column number where this node occurs in the XSL file.
-	 * @return the column number where this node occurs in the XSL file.
-	 */
-	public int getColumnNumber()
-	{
-		return columnNumber;
-	}
-
-	/**
-	 * Set the document offset where this node occurs.
-	 * @param offset the document offset
-	 */
-	public void setOffset(int offset)
-	{
-		this.offset = offset;
-	}
-	
-	/**
-	 * Get the document offset where this node occurs.
-	 * @return the document offset
-	 */
-	public int getOffset()
-	{
-		return offset;
-	}
-
-	/**
-	 * Set the length of this node.
-	 * @param length the node length
-	 */
-	public void setLength(int length)
-	{
-		this.length = length;
-	}
-	
-	/**
-	 * Get the length of this node.
-	 * @return the node length
-	 */
-	public int getLength()
-	{
-		return length;
-	}
-	
-	/**
-	 * Get the type of node.
-	 * 
-	 * @return one of <code>ELEMENT_NODE</code> or <code>ATTRIBUTE_NODE</code>
-	 */
-	public short getNodeType()
-	{
-		return type;
-	}
-	
-	@Override
-	public String toString() {
-		return "file="+stylesheet+", line="+lineNumber+", col="+columnNumber;  //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java
deleted file mode 100644
index cfb19de..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/ResolverExtension.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Jesper Steen Moeller and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jesper Steen Moeller - XSL core plugin
- * Doug Satchwell - bug 225304
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.core.resolver;
-
-import java.io.IOException;
-import java.net.URL;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverExtension;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xsl.core.Messages;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.XSLCorePlugin;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * TODO: Javadoc
- * 
- * @author Jesper Steen Moeller
- * 
- */
-public class ResolverExtension implements URIResolverExtension
-{
-	private static final Double DEFAULT_XSLT_VERSION = 1.0;
-	private static final String XSLT_STYLESHEET = "stylesheet"; //$NON-NLS-1$
-	private static final String XSLT_TEMPLATE = "template"; //$NON-NLS-1$
-	private static final String XSLT_VERSION = "version"; //$NON-NLS-1$
-
-	private boolean initialised;
-	private String xslt_1_0_fileURL;
-	private String xslt_2_0_fileURL;
-
-	public String resolve(IFile file, String baseLocation, String publicId, String systemId)
-	{
-
-		// Is someone looking for "our" schema?
-		if (!XSLCore.XSL_NAMESPACE_URI.equals(publicId))
-		{
-			// Not this time, return right away
-			return null;
-		}
-
-		String version = null;
-
-		if (file != null)
-			version = peekVersionAttributeFromSSE(file);
-		if (version == null)
-			version = peekVersionFromFile(file, baseLocation);
-
-		if (version == null)
-			return null;
-
-		Double versionNumber = null;
-		try
-		{
-			versionNumber = Double.valueOf(version);
-		}
-		catch (Throwable t)
-		{
-			// Not interested
-		}
-
-		if (versionNumber == null)
-		{
-			versionNumber = DEFAULT_XSLT_VERSION;
-		}
-
-		// We carelessly ditch the fraction part
-		int intVersion = versionNumber.intValue();
-		checkInitialised();
-		if (intVersion == 1)
-		{
-			return xslt_1_0_fileURL;
-		}
-		else if (intVersion == 2)
-		{
-			return xslt_2_0_fileURL;
-		}
-		else
-			return null;
-	}
-
-	private void checkInitialised()
-	{
-		if (!initialised)
-		{
-			initialised = true;
-			try
-			{
-				URL pluginURL = FileLocator.find(XSLCorePlugin.getDefault().getBundle(), new Path("/xslt-schemas/xslt-1.0.xsd"), null); //$NON-NLS-1$
-				xslt_1_0_fileURL = FileLocator.toFileURL(pluginURL).toExternalForm();
-				pluginURL = FileLocator.find(XSLCorePlugin.getDefault().getBundle(), new Path("/xslt-schemas/xslt-2.0.xsd"), null); //$NON-NLS-1$
-				xslt_2_0_fileURL = FileLocator.toFileURL(pluginURL).toExternalForm();
-			}
-			catch (IOException e)
-			{
-				XSLCorePlugin.log(e);
-			}
-		}
-	}
-
-	private String peekVersionFromFile(IFile file, String baseLocation)
-	{
-		XSLVersionHandler handler = new XSLVersionHandler();
-		try
-		{
-			handler.parseContents(file != null ? createInputSource(file) : createInputSource(baseLocation));
-		}
-		catch (SAXException se)
-		{
-			XSLCorePlugin.log(se);
-			// drop through, since this is almost to be expected
-		}
-		catch (IOException ioe)
-		{
-			XSLCorePlugin.log(new CoreException(XSLCorePlugin.newErrorStatus("Can't parse XSL document", ioe))); //$NON-NLS-1$
-			// drop through, since this is not really a show-stopper
-		}
-		catch (ParserConfigurationException pce)
-		{
-			// some bad thing happened - force this describer to be disabled
-			String message = Messages.XSLCorePlugin_parserConfiguration;
-			XSLCorePlugin.log(new Status(IStatus.ERROR, XSLCorePlugin.PLUGIN_ID, 0, message, pce));
-			throw new RuntimeException(message);
-			// drop through, since this is not really a show-stopper
-		}
-		catch (CoreException ce)
-		{
-			XSLCorePlugin.log(ce);
-			// drop through, since this is not really a show-stopper
-		}
-
-		String versionX = handler.getVersionAttribute();
-		return versionX;
-	}
-
-	private String peekVersionAttributeFromSSE(IFile file)
-	{
-		IModelManager manager = StructuredModelManager.getModelManager();
-
-		if (manager != null)
-		{
-			String id = manager.calculateId(file);
-			IStructuredModel model = manager.getExistingModelForRead(id);
-			try
-			{
-				if (model instanceof IDOMModel)
-				{
-					Document doc = ((IDOMModel) model).getDocument();
-					if (doc != null && doc.getDocumentElement() != null)
-					{
-						Element documentElement = doc.getDocumentElement();
-						if (XSLT_STYLESHEET.equals(documentElement.getLocalName()) || XSLT_TEMPLATE.equals(documentElement.getLocalName()))
-						{
-							return documentElement.getAttribute(XSLT_VERSION);
-						}
-						else
-							return ""; //$NON-NLS-1$
-					}
-				}
-			}
-			finally
-			{
-				// bug 225304
-				if (model != null)
-					model.releaseFromRead();
-			}
-		}
-		return null;
-	}
-
-	private InputSource createInputSource(String systemId) throws CoreException
-	{
-		return new InputSource(systemId);
-	}
-
-	private InputSource createInputSource(IFile file) throws CoreException
-	{
-		InputSource src = new InputSource(file.getContents());
-		src.setSystemId(file.getLocationURI().toString());
-		return src;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/XSLVersionHandler.java b/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/XSLVersionHandler.java
deleted file mode 100644
index 8d1f99f..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/XSLVersionHandler.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- * Jesper Steen M�ller - adapted from org.eclipse.core.internal.content
- **********************************************************************/
-
-package org.eclipse.wst.xsl.core.resolver;
-
-import java.io.IOException;
-import java.io.StringReader;
-import javax.xml.parsers.*;
-
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.XSLCorePlugin;
-import org.xml.sax.*;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * A simple XML parser to find the XSL version of a given XML file, expectedly a XSLT stylesheet.
- */
-public final class XSLVersionHandler extends DefaultHandler implements LexicalHandler, ErrorHandler {
-	/**
-	 * An exception indicating that the parsing should stop. This is usually
-	 * triggered when the top-level element has been found.
-	 * 
-	 * @since 3.0
-	 */
-	private class StopParsingException extends SAXException {
-		/**
-		 * All serializable objects should have a stable serialVersionUID
-		 */
-		private static final long serialVersionUID = 1L;
-
-		/**
-		 * Constructs an instance of <code>StopParsingException</code> with a
-		 * <code>null</code> detail message.
-		 */
-		public StopParsingException() {
-			super((String) null);
-		}
-	}
-
-	private static final String XSLT_STYLESHEET = "stylesheet"; //$NON-NLS-1$
-
-	private static final String XSLT_TEMPLATE = "template"; //$NON-NLS-1$
-
-	private static final String XSLT_VERSION = "version"; //$NON-NLS-1$
-
-	/**
-	 * This is the value of the version attribute in the XSLT file.
-	 * This member variable is <code>null</code> unless the file has been
-	 * parsed successful to the point of finding the top-level element,
-	 * and locating the 'version' attribute there.
-	 */
-	private String versionAttribute = null;
-
-	/**
-	 * TODO: Add Javadoc
-	 */
-	public XSLVersionHandler() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#comment(char[], int, int)
-	 */
-	public final void comment(final char[] ch, final int start, final int length) {
-		// Not interested.
-	}
-
-	/**
-	 * Creates a new SAX parser for use within this instance.
-	 * 
-	 * @return The newly created parser.
-	 * 
-	 * @throws ParserConfigurationException
-	 *             If a parser of the given configuration cannot be created.
-	 * @throws SAXException
-	 *             If something in general goes wrong when creating the parser.
-	 * @throws SAXNotRecognizedException
-	 *             If the <code>XMLReader</code> does not recognize the
-	 *             lexical handler configuration option.
-	 * @throws SAXNotSupportedException
-	 *             If the <code>XMLReader</code> does not support the lexical
-	 *             handler configuration option.
-	 */
-	private final SAXParser createParser(SAXParserFactory parserFactory) throws ParserConfigurationException, SAXException, SAXNotRecognizedException, SAXNotSupportedException {
-		// Initialize the parser.
-		final SAXParser parser = parserFactory.newSAXParser();
-		final XMLReader reader = parser.getXMLReader();
-		reader.setProperty("http://xml.org/sax/properties/lexical-handler", this); //$NON-NLS-1$
-		reader.setErrorHandler(this); // This helps to ignore errors
-		// disable DTD validation
-		try {
-			//	be sure validation is "off" or the feature to ignore DTD's will not apply
-			reader.setFeature("http://xml.org/sax/features/validation", false); //$NON-NLS-1$
-			reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false); //$NON-NLS-1$
-		} catch (SAXNotRecognizedException e) {
-			// not a big deal if the parser does not recognize the features
-		} catch (SAXNotSupportedException e) {
-			// not a big deal if the parser does not support the features
-		}
-		return parser;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#endCDATA()
-	 */
-	public final void endCDATA() {
-		// Not interested.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#endDTD()
-	 */
-	public final void endDTD() {
-		// Not interested.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String)
-	 */
-	public final void endEntity(final String name) {
-		// Not interested.
-	}
-
-	/**
-	 * TODO: Add Javadoc
-	 * @return
-	 */
-	public String getVersionAttribute() {
-		return versionAttribute;
-	}
-
-	/**
-	 * TODO: Add Javadoc
-	 * @param contents
-	 * @return
-	 * @throws IOException
-	 * @throws ParserConfigurationException
-	 * @throws SAXException
-	 */
-	public boolean parseContents(InputSource contents) throws IOException, ParserConfigurationException, SAXException {
-		// Parse the file into we have what we need (or an error occurs).
-		try {
-			SAXParserFactory factory = XSLCorePlugin.getDefault().getFactory();
-			if (factory == null)
-				return false;
-			final SAXParser parser = createParser(factory);
-			// to support external entities specified as relative URIs (see bug 63298)
-			parser.parse(contents, this);
-		} catch (StopParsingException e) {
-			// Abort the parsing normally. Fall through...
-		}
-		return true;
-	}
-
-	/*
-	 * Resolve external entity definitions to an empty string.  This is to speed
-	 * up processing of files with external DTDs.  Not resolving the contents 
-	 * of the DTD is ok, as only the System ID of the DTD declaration is used.
-	 * @see org.xml.sax.helpers.DefaultHandler#resolveEntity(java.lang.String, java.lang.String)
-	 */
-	public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
-		return new InputSource(new StringReader("")); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#startCDATA()
-	 */
-	public final void startCDATA() {
-		// Not interested.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#startDTD(java.lang.String,
-	 *      java.lang.String, java.lang.String)
-	 */
-	public final void startDTD(final String name, final String publicId, final String systemId) throws SAXException {
-		// Not interested.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ContentHandler#startElement(java.lang.String,
-	 *      java.lang.String, java.lang.String, org.xml.sax.Attributes)
-	 */
-	public final void startElement(final String uri, final String elementName, final String qualifiedName, final Attributes attributes) throws SAXException {
-		if (uri.equals(XSLCore.XSL_NAMESPACE_URI) && (XSLT_TEMPLATE.equals(elementName) || XSLT_STYLESHEET.equals(elementName))) {
-			versionAttribute = attributes.getValue(XSLT_VERSION);
-		} else {
-			versionAttribute = ""; //$NON-NLS-1$
-		}
-		throw new StopParsingException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String)
-	 */
-	public final void startEntity(final String name) {
-		// Not interested.
-	}
-	
-	@Override
-	public void warning(SAXParseException e) throws SAXException {
-		// Not interested.
-	}
-	
-	@Override
-	public void error(SAXParseException e) throws SAXException {
-		// Not interested.
-	}
-	
-	@Override
-	public void fatalError(SAXParseException e) throws SAXException {
-		// Not interested.
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/encoding/XSLDocumentLoader.java b/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/encoding/XSLDocumentLoader.java
deleted file mode 100755
index eb8da74..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/encoding/XSLDocumentLoader.java
+++ /dev/null
@@ -1,74 +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 - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.internal.encoding;
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.sse.core.internal.document.AbstractDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentCharsetDetector;
-import org.eclipse.wst.xml.core.internal.parser.XMLStructuredDocumentReParser;
-import org.eclipse.wst.xsl.core.internal.parser.XSLSourceParser;
-import org.eclipse.wst.xsl.core.internal.text.rules.StructuredTextPartitionerForXSL;
-
-
-/**
- * This class reads an XSL file and creates an XML Structured Model.
- * 
- */
-public class XSLDocumentLoader extends AbstractDocumentLoader {
-
-	public XSLDocumentLoader() {
-		super();
-	}
-
-	@Override
-	public IDocumentPartitioner getDefaultDocumentPartitioner() {
-		return new StructuredTextPartitionerForXSL();
-	}
-
-	public IDocumentCharsetDetector getDocumentEncodingDetector() {
-		if (fDocumentEncodingDetector == null) {
-			fDocumentEncodingDetector = new XMLDocumentCharsetDetector();
-		}
-		return fDocumentEncodingDetector;
-	}
-
-	public RegionParser getParser() {
-		return new XSLSourceParser();
-	}
-
-	protected String getSpecDefaultEncoding() {
-		// by default, UTF-8 as per XML spec
-		final String enc = "UTF-8"; //$NON-NLS-1$
-		return enc;
-	}
-
-	@Override
-	protected IEncodedDocument newEncodedDocument() {
-		IStructuredDocument structuredDocument = StructuredDocumentFactory.getNewStructuredDocumentInstance(getParser());
-		if (structuredDocument instanceof BasicStructuredDocument) {
-			((BasicStructuredDocument) structuredDocument).setReParser(new XMLStructuredDocumentReParser());
-		}
-		return structuredDocument;
-	}
-
-	public IDocumentLoader newInstance() {
-		return new XSLDocumentLoader();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/modelhandler/ModelHandlerForXSL.java b/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/modelhandler/ModelHandlerForXSL.java
deleted file mode 100755
index 5b0af71..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/modelhandler/ModelHandlerForXSL.java
+++ /dev/null
@@ -1,60 +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 - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.core.internal.modelhandler;
-
-import org.eclipse.wst.sse.core.internal.document.IDocumentCharsetDetector;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentCharsetDetector;
-import org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.encoding.XSLDocumentLoader;
-
-
-/**
- * Provides generic XML model handling. It is also marked as the default
- * content type handler. There should be only one implementation of the
- * default.
- */
-public class ModelHandlerForXSL extends ModelHandlerForXML implements IModelHandler {
-	/**
-	 * Needs to match what's in plugin registry. In fact, can be overwritten
-	 * at run time with what's in registry! (so should never be 'final')
-	 */
-	static String AssociatedContentTypeID = XSLCore.XSL_CONTENT_TYPE;
-	/**
-	 * Needs to match what's in plugin registry. In fact, can be overwritten
-	 * at run time with what's in registry! (so should never be 'final')
-	 */
-	private static String ModelHandlerID = "org.eclipse.wst.xsl.core.modelhandler"; //$NON-NLS-1$
-
-	public ModelHandlerForXSL() {
-		super();	
-		setId(ModelHandlerID);
-		setAssociatedContentTypeId(AssociatedContentTypeID);
-	}
-
-	public IDocumentLoader getDocumentLoader() {
-		return new XSLDocumentLoader();
-	}
-
-	public IDocumentCharsetDetector getEncodingDetector() {
-		return new XMLDocumentCharsetDetector();
-	}
-
-	public IModelLoader getModelLoader() {
-		return new XSLModelLoader();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/modelhandler/XSLModelLoader.java b/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/modelhandler/XSLModelLoader.java
deleted file mode 100755
index 88f7a79..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/modelhandler/XSLModelLoader.java
+++ /dev/null
@@ -1,92 +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 - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.core.internal.modelhandler;
-
-import org.eclipse.wst.sse.core.internal.PropagatingAdapter;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLoader;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.DebugAdapterFactory;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.modelhandler.XMLModelLoader;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xsl.core.internal.encoding.XSLDocumentLoader;
-
-
-/**
- * This class reads an XML file and creates an XML Structured Model.
- *  
- */
-public class XSLModelLoader extends XMLModelLoader {
-
-	//	private static final String STR_ENCODING = "encoding"; //$NON-NLS-1$
-
-	/**
-	 * XMLLoader constructor comment.
-	 */
-	public XSLModelLoader() {
-		super();
-	}
-
-//	@Override
-//	public List getAdapterFactories() {
-//		List result = new ArrayList();
-//		INodeAdapterFactory factory = null;
-//		factory = new ModelQueryAdapterFactoryForXML();
-//		result.add(factory);
-//		// Does XML need propagating adapter? Or just JSP?
-//		factory = new PropagatingAdapterFactoryImpl();
-//		result.add(factory);
-//		return result;
-//	}
-
-	@Override
-	public IDocumentLoader getDocumentLoader() {
-		if (documentLoaderInstance == null) {
-			documentLoaderInstance = new XSLDocumentLoader();
-		}
-		return documentLoaderInstance;
-	}
-
-	@Override
-	public IModelLoader newInstance() {
-		return new XSLModelLoader();
-	}
-
-	@Override
-	public IStructuredModel newModel() {
-		return new DOMModelImpl();
-	}
-
-	@Override
-	protected void preLoadAdapt(IStructuredModel structuredModel) {
-		super.preLoadAdapt(structuredModel);
-		IDOMModel domModel = (IDOMModel) structuredModel;
-		// if there is a model in the adapter, this will adapt it to
-		// first node. After that the PropagatingAdater spreads over the
-		// children being
-		// created. Each time that happends, a side effect is to
-		// also "spread" sprecific registered adapters,
-		// they two can propigate is needed.
-		((INodeNotifier) domModel.getDocument()).getAdapterFor(PropagatingAdapter.class);
-
-		if (Debug.debugNotificationAndEvents) {
-			PropagatingAdapter propagatingAdapter = (PropagatingAdapter) ((INodeNotifier) domModel.getDocument()).getAdapterFor(PropagatingAdapter.class);
-			propagatingAdapter.addAdaptOnCreateFactory(new DebugAdapterFactory());
-		}
-
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/parser/XSLSourceParser.java b/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/parser/XSLSourceParser.java
deleted file mode 100644
index ec063af..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/parser/XSLSourceParser.java
+++ /dev/null
@@ -1,212 +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 - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.core.internal.parser;
-
-import org.eclipse.wst.sse.core.internal.ltk.parser.BlockTokenizer;
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-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.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-public class XSLSourceParser extends XMLSourceParser {
-
-
-	public XSLSourceParser() {
-		super();
-	}
-	
-	@Override
-	public RegionParser newInstance() {
-		XSLSourceParser newInstance = new XSLSourceParser();
-		newInstance.setTokenizer(getTokenizer().newInstance());
-		return newInstance;
-	}
-	@Override
-	protected void setTokenizer(BlockTokenizer newTokenizer) {
-		// TODO Auto-generated method stub
-		super.setTokenizer(newTokenizer);
-	}
-	
-	protected IStructuredDocumentRegion parseNodes() {
-		// regions are initially reported as complete offsets within the
-		// scanned input
-		// they are adjusted here to be indexes from the currentNode's start
-		// offset
-		IStructuredDocumentRegion headNode = null;
-		IStructuredDocumentRegion lastNode = null;
-		ITextRegion region = null;
-		IStructuredDocumentRegion currentNode = null;
-		String type = null;
-
-		while ((region = getNextRegion()) != null) {
-			type = region.getType();
-			// these types (might) demand a IStructuredDocumentRegion for each
-			// of them
-			
-			if (type == DOMRegionContext.BLOCK_TEXT) {
-				if (currentNode != null && currentNode.getLastRegion().getType() == DOMRegionContext.BLOCK_TEXT) {
-					// multiple block texts indicated embedded containers; no
-					// new IStructuredDocumentRegion
-					currentNode.addRegion(region);
-					currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-					region.adjustStart(-currentNode.getStart());
-					// DW 4/16/2003 regions no longer have parents
-					// region.setParent(currentNode);
-				}
-				else {
-					// not continuing a IStructuredDocumentRegion
-					if (currentNode != null) {
-						// ensure that any existing node is at least
-						// terminated
-						if (!currentNode.isEnded()) {
-							currentNode.setLength(region.getStart() - currentNode.getStart());
-							// fCurrentNode.setTextLength(region.getStart() -
-							// fCurrentNode.getStart());
-						}
-						lastNode = currentNode;
-					}
-					fireNodeParsed(currentNode);
-					currentNode = createStructuredDocumentRegion(type);
-					if (lastNode != null) {
-						lastNode.setNext(currentNode);
-					}
-					currentNode.setPrevious(lastNode);
-					currentNode.setStart(region.getStart());
-					currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-					currentNode.setEnded(true);
-					region.adjustStart(-currentNode.getStart());
-					currentNode.addRegion(region);
-					// DW 4/16/2003 regions no longer have parents
-					// region.setParent(currentNode);
-				}
-			}
-			// the following contexts OPEN new StructuredDocumentRegions
-			else if ((currentNode != null && currentNode.isEnded()) || (type == DOMRegionContext.XML_CONTENT) || (type == DOMRegionContext.XML_CHAR_REFERENCE) || (type == DOMRegionContext.XML_ENTITY_REFERENCE) || (type == DOMRegionContext.XML_PI_OPEN) || (type == DOMRegionContext.XML_TAG_OPEN) || (type == DOMRegionContext.XML_END_TAG_OPEN) || (type == DOMRegionContext.XML_COMMENT_OPEN) || (type == DOMRegionContext.XML_CDATA_OPEN) || (type == DOMRegionContext.XML_DECLARATION_OPEN)) {
-				if (currentNode != null) {
-					// ensure that any existing node is at least terminated
-					if (!currentNode.isEnded()) {
-						currentNode.setLength(region.getStart() - currentNode.getStart());
-						// fCurrentNode.setTextLength(region.getStart() -
-						// fCurrentNode.getStart());
-					}
-					lastNode = currentNode;
-				}
-				fireNodeParsed(currentNode);
-				currentNode = createStructuredDocumentRegion(type);
-				if (lastNode != null) {
-					lastNode.setNext(currentNode);
-				}
-				currentNode.setPrevious(lastNode);
-				currentNode.setStart(region.getStart());
-				currentNode.addRegion(region);
-				currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-				region.adjustStart(-currentNode.getStart());
-				// DW 4/16/2003 regions no longer have parents
-				// region.setParent(currentNode);
-			}
-			// the following contexts neither open nor close
-			// StructuredDocumentRegions; just add to them
-			else if ((type == DOMRegionContext.XML_TAG_NAME) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) || (type == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) || (type == DOMRegionContext.XML_COMMENT_TEXT) || (type == DOMRegionContext.XML_PI_CONTENT) || (type == DOMRegionContext.XML_DOCTYPE_INTERNAL_SUBSET)) {
-				currentNode.addRegion(region);
-				currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-				region.adjustStart(-currentNode.getStart());
-				// DW 4/16/2003 regions no longer have parents
-				// region.setParent(currentNode);
-			}
-			// the following contexts close off StructuredDocumentRegions
-			// cleanly
-			else if ((type == DOMRegionContext.XML_PI_CLOSE) || (type == DOMRegionContext.XML_TAG_CLOSE) || (type == DOMRegionContext.XML_EMPTY_TAG_CLOSE) || (type == DOMRegionContext.XML_COMMENT_CLOSE) || (type == DOMRegionContext.XML_DECLARATION_CLOSE) || (type == DOMRegionContext.XML_CDATA_CLOSE)) {
-				currentNode.setEnded(true);
-				currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-				currentNode.addRegion(region);
-				region.adjustStart(-currentNode.getStart());
-				// DW 4/16/2003 regions no longer have parents
-				// region.setParent(currentNode);
-			}
-			// this is extremely rare, but valid
-			else if (type == DOMRegionContext.WHITE_SPACE) {
-				ITextRegion lastRegion = currentNode.getLastRegion();
-				// pack the embedded container with this region
-				if (lastRegion instanceof ITextRegionContainer) {
-					ITextRegionContainer container = (ITextRegionContainer) lastRegion;
-					container.getRegions().add(region);
-					// containers must have parent set ...
-					// setting for EACH subregion is redundent, but not sure
-					// where else to do, so will do here for now.
-					container.setParent(currentNode);
-					// DW 4/16/2003 regions no longer have parents
-					// region.setParent(container);
-					region.adjustStart(container.getLength() - region.getStart());
-				}
-				currentNode.getLastRegion().adjustLength(region.getLength());
-				currentNode.adjustLength(region.getLength());
-			}
-			else if (type == DOMRegionContext.UNDEFINED && currentNode != null) {
-				// skip on a very-first region situation as the default
-				// behavior is good enough
-				// combine with previous if also undefined
-				if (currentNode.getLastRegion() != null && currentNode.getLastRegion().getType() == DOMRegionContext.UNDEFINED) {
-					currentNode.getLastRegion().adjustLength(region.getLength());
-					currentNode.adjustLength(region.getLength());
-				}
-				// previous wasn't undefined
-				else {
-					currentNode.addRegion(region);
-					currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-					region.adjustStart(-currentNode.getStart());
-				}
-			}
-			else {
-				// if an unknown type is the first region in the document,
-				// ensure that a node exists
-				if (currentNode == null) {
-					currentNode = createStructuredDocumentRegion(type);
-					currentNode.setStart(region.getStart());
-				}
-				currentNode.addRegion(region);
-				currentNode.setLength(region.getStart() + region.getLength() - currentNode.getStart());
-				region.adjustStart(-currentNode.getStart());
-				// DW 4/16/2003 regions no longer have parents
-				// region.setParent(currentNode);
-				if (Debug.debugTokenizer)
-					System.out.println(getClass().getName() + " found region of not specifically handled type " + region.getType() + " @ " + region.getStart() + "[" + region.getLength() + "]"); //$NON-NLS-4$//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-				//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-			}
-
-			// these regions also get their own node, so close them cleanly
-			// NOTE: these regions have new StructuredDocumentRegions created
-			// for them above; it may
-			// be more readable if that is handled here as well, but the
-			// current layout
-			// ensures that they open StructuredDocumentRegions the same way
-			if ((type == DOMRegionContext.XML_CONTENT) || (type == DOMRegionContext.XML_CHAR_REFERENCE) || (type == DOMRegionContext.XML_ENTITY_REFERENCE)) {
-				currentNode.setEnded(true);
-			}
-			if (headNode == null && currentNode != null) {
-				headNode = currentNode;
-			}
-		}
-		if (currentNode != null) {
-			fireNodeParsed(currentNode);
-			currentNode.setPrevious(lastNode);
-		}
-		// fStringInput = null;
-		primReset();
-		return headNode;
-	}
-	
-}
-
diff --git a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/parser/regions/XPathSeparatorRegion.java b/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/parser/regions/XPathSeparatorRegion.java
deleted file mode 100755
index 2714045..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/parser/regions/XPathSeparatorRegion.java
+++ /dev/null
@@ -1,92 +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 - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.internal.parser.regions;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.parser.regions.RegionToStringUtil;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-
-public class XPathSeparatorRegion implements ITextRegion {
-	static private final byte fTextLength = 1;
-	static private final String fType = DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS;
-	private short fLength;
-	private int fStart;
-
-
-	public XPathSeparatorRegion() {
-		super();
-	}
-
-	public XPathSeparatorRegion(int start, int textLength, int length) {
-		this();
-		fStart = start;
-		fLength = (short) length;
-	}
-
-
-	public void adjustLength(int i) {
-		fLength += i;
-
-	}
-
-	public void adjustStart(int i) {
-		fStart += i;
-
-	}
-
-	public void adjustTextLength(int i) {
-		// not supported
-
-	}
-
-	public void equatePositions(ITextRegion region) {
-		fStart = region.getStart();
-		fLength = (short) region.getLength();
-	}
-
-	public int getEnd() {
-		return fStart + fLength;
-	}
-
-	public int getLength() {
-		return fLength;
-	}
-
-	public int getStart() {
-		return fStart;
-	}
-
-	public int getTextEnd() {
-		return fStart + fTextLength;
-	}
-
-	public int getTextLength() {
-		return fTextLength;
-	}
-
-	public String getType() {
-		return fType;
-	}
-
-	public String toString() {
-		return RegionToStringUtil.toString(this);
-	}
-
-	public StructuredDocumentEvent updateRegion(Object requester, IStructuredDocumentRegion parent, String changes, int requestStart, int lengthToReplace) {
-		// can never be updated
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/regions/XPathRegionContext.java b/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/regions/XPathRegionContext.java
deleted file mode 100755
index f46db8a..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/regions/XPathRegionContext.java
+++ /dev/null
@@ -1,27 +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 - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.internal.regions;
-
-public interface XPathRegionContext {
-
-	public static final String BLOCK_TEXT = "BLOCK_TEXT"; //$NON-NLS-1$
-
-	public static final String UNDEFINED = "UNDEFINED"; //$NON-NLS-1$
-
-	public static final String WHITE_SPACE = "WHITE_SPACE"; //$NON-NLS-1$
-
-	public static final String XPATH_CONTENT = "XPATH_CONTENT"; //$NON-NLS-1$
-	public static final String XPATH_SEPARATOR_DIV = "XPATH_SEPARATOR_DIV"; //$NON-NLS-1$
-	public static final String XPATH_FUNCTION_PARAMETERS_OPEN = "XPATH_FUNCTION_PARAMETERS_OPEN"; //$NON-NLS-1$
-	public static final String XPATH_FUNCTION_PARAMETERS_CLOSE = "XPATH_FUNCTION_PARAMETERS_CLOSE"; //$NON-NLS-1$
-	public static final String XPATH_FUNCTION_NAME = "XPATH_FUNCTION_NAME"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/regions/XSLParserRegionFactory.java b/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/regions/XSLParserRegionFactory.java
deleted file mode 100644
index 45c11df..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/regions/XSLParserRegionFactory.java
+++ /dev/null
@@ -1,19 +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 - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.core.internal.regions;
-
-import org.eclipse.wst.xml.core.internal.parser.regions.XMLParserRegionFactory;
-
-public class XSLParserRegionFactory extends XMLParserRegionFactory {
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/text/IXSLPartitions.java b/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/text/IXSLPartitions.java
deleted file mode 100755
index 48b1c42..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/text/IXSLPartitions.java
+++ /dev/null
@@ -1,27 +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 - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.internal.text;
-
-
-
-/**
- * This interface is not intended to be implemented.
- * It defines the partition types for XSL.
- * Clients should reference the partition type Strings defined here directly.
- * 
- * @since 0.5M7
- */
-public interface IXSLPartitions {
-	
-	String XSL_XPATH = "org.eclipse.wst.xsl.XSL_XPATH"; //$NON-NLS-1$
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/text/rules/StructuredTextPartitionerForXSL.java b/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/text/rules/StructuredTextPartitionerForXSL.java
deleted file mode 100755
index f9cd56d..0000000
--- a/bundles/org.eclipse.wst.xsl.core/src_sse/org/eclipse/wst/xsl/core/internal/text/rules/StructuredTextPartitionerForXSL.java
+++ /dev/null
@@ -1,64 +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 - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.internal.text.rules;
-
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextPartitioner;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-import org.eclipse.wst.xsl.core.internal.text.IXSLPartitions;
-
-/**
- * Contains information specific to setting up Structured Document Partions 
- * in XSL documents. 
- * @author dcarver
- *
- */
-public class StructuredTextPartitionerForXSL extends StructuredTextPartitionerForXML implements IStructuredTextPartitioner {
-
-	private final static String[] configuredContentTypes = new String[]{IXMLPartitions.XML_DEFAULT, IXMLPartitions.XML_CDATA, IXMLPartitions.XML_PI, IXMLPartitions.XML_DECLARATION, IXMLPartitions.XML_COMMENT, IXMLPartitions.DTD_SUBSET, IXSLPartitions.XSL_XPATH};
-
-	/**
-	 * The StructuredTextPartitionerForXSL adds the necessary
-	 * Partition types to help Identify potential XPath areas.
-	 * This is also used for Line Styling and Content Assistance.
-	 */
-	public StructuredTextPartitionerForXSL() {
-		super();
-	}
-
-	@Override
-	public String getPartitionType(ITextRegion region, int offset) {
-		String result = null;
-		if (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-					result = IXSLPartitions.XSL_XPATH;
-		} else {
-			result = super.getPartitionType(region, offset);
-		}
-		return result;
-	}
-	
-	public static String[] getConfiguredContentTypes() {
-		return configuredContentTypes;
-	}
-	
-	@Override
-	public IDocumentPartitioner newInstance() {
-		StructuredTextPartitionerForXML instance = new StructuredTextPartitionerForXML();
-		return instance;
-	}
-	
-
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xinclude.xsd b/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xinclude.xsd
deleted file mode 100644
index 4b1cb30..0000000
--- a/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xinclude.xsd
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-*******************************************************************************
- * W3C® SOFTWARE NOTICE AND LICENSE
- * http://www.w3.org/Consortium/Legal/copyright-software-19980720
- *
- * Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
- * Technology, Institut National de Recherche en Informatique et en Automatique,
- * Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
- *
- * This W3C work (including software, documents, or other related items) is being
- * provided by the copyright holders under the following license. By obtaining,
- * using and/or copying this work, you (the licensee) agree that you have read,
- * understood, and will comply with the following terms and conditions:
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation, with or without modification,  for any purpose and without fee
- * or royalty is hereby granted, provided that you include the following on ALL copies
- * of the software and documentation or portions thereof, including modifications, that
- * you make:
- *
- *  1. The full text of this NOTICE in a location viewable to users of the redistributed
- *     or derivative work.
- *  2. Any pre-existing intellectual property disclaimers, notices, or terms and
- *     conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
- *  3. Notice of any changes or modifications to the W3C files, including the date changes
- *     were made. (We recommend you provide URIs to the location from which the code is
- *     derived.)
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO 
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
- * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
- * THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
- * TRADEMARKS OR OTHER RIGHTS.
- *
- * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
- *
- * The name and trademarks of copyright holders may NOT be used in advertising or publicity
- * pertaining to the software without specific, written prior permission. Title to copyright
- * in this software and any associated documentation will at all times remain with copyright
- * holders.
- ******************************************************************************************** 
- -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xi="http://www.w3.org/2001/XInclude"
-           targetNamespace="http://www.w3.org/2001/XInclude"
-           finalDefault="extension">
-
-  <xs:element name="include" type="xi:includeType" />
-
-  <xs:complexType name="includeType" mixed="true">
-    <xs:choice minOccurs='0' maxOccurs='unbounded' >
-      <xs:element ref='xi:fallback' />
-      <xs:any namespace='##other' processContents='lax' />
-      <xs:any namespace='##local' processContents='lax' />
-    </xs:choice>
-    <xs:attribute name="href" use="optional" type="xs:anyURI"/>
-    <xs:attribute name="parse" use="optional" default="xml"
-                  type="xi:parseType" />
-    <xs:attribute name="xpointer" use="optional" type="xs:string"/>
-    <xs:attribute name="encoding" use="optional" type="xs:string"/>
-    <xs:attribute name="accept" use="optional" type="xs:string"/>
-    <xs:attribute name="accept-language" use="optional" type="xs:string"/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-
-  <xs:simpleType name="parseType">
-    <xs:restriction base="xs:token">
-      <xs:enumeration value="xml"/>
-      <xs:enumeration value="text"/>
-    </xs:restriction>
-  </xs:simpleType>
-  
-  <xs:element name="fallback" type="xi:fallbackType" />
-
-  <xs:complexType name="fallbackType" mixed="true">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element ref="xi:include"/>
-      <xs:any namespace="##other" processContents="lax"/>
-      <xs:any namespace="##local" processContents="lax"/>
-    </xs:choice>
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:complexType>
-
-</xs:schema>
diff --git a/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xslt-1.0.xsd b/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xslt-1.0.xsd
deleted file mode 100644
index c922450..0000000
--- a/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xslt-1.0.xsd
+++ /dev/null
@@ -1,1708 +0,0 @@
-<?xml version="1.0"?>
-<!--
- *******************************************************************************
- * Copyright (c) 2001, 2007 - W3C, 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 - 20071228 - STAR - Updated to XML Schemas 2001 1.0
- *         Note this schemas is a modified version of the schema for XSLT 2.0, it has
- *         been stripped of all XSLT 2.0 additions, to bring it in line with the XSLT 1.0
- *         specification.
- *         The original version may be found at http://www.w3.org/2007/schema-for-xslt20.xsd
- *         The original W3C copyright notice is included:
- *     David Carver - 20080330 - STAR - bug 224819 - changed procesContents from lax to skip
- *******************************************************************************
- *******************************************************************************
- * W3C® SOFTWARE NOTICE AND LICENSE
- * http://www.w3.org/Consortium/Legal/copyright-software-19980720
- *
- * Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
- * Technology, Institut National de Recherche en Informatique et en Automatique,
- * Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
- *
- * This W3C work (including software, documents, or other related items) is being
- * provided by the copyright holders under the following license. By obtaining,
- * using and/or copying this work, you (the licensee) agree that you have read,
- * understood, and will comply with the following terms and conditions:
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation, with or without modification,  for any purpose and without fee
- * or royalty is hereby granted, provided that you include the following on ALL copies
- * of the software and documentation or portions thereof, including modifications, that
- * you make:
- *
- *  1. The full text of this NOTICE in a location viewable to users of the redistributed
- *     or derivative work.
- *  2. Any pre-existing intellectual property disclaimers, notices, or terms and
- *     conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
- *  3. Notice of any changes or modifications to the W3C files, including the date changes
- *     were made. (We recommend you provide URIs to the location from which the code is
- *     derived.)
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO 
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
- * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
- * THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
- * TRADEMARKS OR OTHER RIGHTS.
- *
- * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
- *
- * The name and trademarks of copyright holders may NOT be used in advertising or publicity
- * pertaining to the software without specific, written prior permission. Title to copyright
- * in this software and any associated documentation will at all times remain with copyright
- * holders.
- ******************************************************************************************** 
- -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-           targetNamespace="http://www.w3.org/1999/XSL/Transform" 
-           elementFormDefault="qualified" >
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-<xs:annotation>
-  <xs:documentation>
-  
-   </xs:documentation>
-</xs:annotation>   
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
-<!--
-The declaration of xml:space and xml:lang may need to be commented out because
-of problems processing the schema using various tools
--->
-      
-<xs:import namespace="http://www.w3.org/XML/1998/namespace" 
-  schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-<xs:annotation>
-  <xs:documentation>
-    PART A: definitions of complex types and model groups used as the basis 
-            for element definitions
-  </xs:documentation>
-</xs:annotation>   
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-<xs:complexType name="generic-element-type" mixed="true">
-  <xs:anyAttribute namespace="##other" processContents="skip"/>
-</xs:complexType>
-
-<!-- <xs:complexType name="versioned-element-type" mixed="true">
-  <xs:complexContent>
-    <xs:extension base="xsl:generic-element-type">    
-      <xs:attribute name="version" type="xs:decimal" use="optional"/>
-
-    </xs:extension>
-  </xs:complexContent>
-</xs:complexType>
--->
-
-<xs:complexType name="element-only-versioned-element-type" mixed="false">
-  <xs:complexContent>
-    <xs:restriction base="xsl:generic-element-type">
-      <xs:anyAttribute namespace="##other" processContents="skip"/>
-    </xs:restriction>
-  </xs:complexContent>
-
-</xs:complexType>
-
-<xs:complexType name="sequence-constructor">
-  <xs:complexContent mixed="true">
-    <xs:extension base="xsl:generic-element-type">    
-      <xs:group ref="xsl:sequence-constructor-group" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:extension>
-  </xs:complexContent>
-</xs:complexType>
-
-<xs:group name="sequence-constructor-group">
-  <xs:choice>
-
-    <xs:element ref="xsl:variable"/>
-    <xs:element ref="xsl:instruction"/>
-    <xs:group ref="xsl:result-elements"/>
-  </xs:choice>
-</xs:group>
-
-<xs:element name="declaration" type="xsl:generic-element-type" abstract="true"/>
-
-<xs:element name="instruction" type="xsl:generic-element-type" abstract="true"/>
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-<xs:annotation>
-  <xs:documentation>
-
-    PART B: definitions of individual XSLT elements    
-    Elements are listed in alphabetical order.    
-  </xs:documentation>
-</xs:annotation>   
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-<xs:element name="apply-imports" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        This command applies template rule from an imported style sheet.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type"/>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="apply-templates" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        Applies template rules based on a given XPath selection criteria.  If no template
-        is found the built in templates are used.
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="xsl:sort"/>
-          <xs:element ref="xsl:with-param"/>
-        </xs:choice>
-        <xs:attribute name="select" type="xsl:expression" default="child::node()">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional. Specifies the XPath criteria to be used to apply the templates.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="mode" type="xsl:mode">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional.  Specifies the type of template to be used if there is more than
-                 one way in which to process the given criteria.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="attribute" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Defines an attribute that will be put in the result set.
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:avt" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Required. The name of the attribute to be created.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="namespace" type="xsl:avt">
-              <xs:annotation>
-                 <xs:documentation source="http://www.w3.org/TR/xslt">
-                    Optional. The namespace for the attribute.
-                 </xs:documentation>
-              </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>        
-
-<xs:element name="attribute-set" substitutionGroup="xsl:declaration">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Defines a group of attributes that will be created and can be reused
-         by other portions of the stylesheet during processing.  These attributes
-         will appear on the resulting document when used.
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:sequence minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="xsl:attribute"/>
-        </xs:sequence>
-        <xs:attribute name="name" type="xsl:QName" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Required.  Name of the attribute set.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="use-attribute-sets" type="xsl:QNames" default="">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  A list of attributes-sets separated by spaces to be used in this
-                  attribute set.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="call-template" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        Specifies the name of a template to be called. A called template
-        is only executed when it is called.  It is not executed directly by
-        an apply-templates command.
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:with-param" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="name" type="xsl:QName" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Required.  The name of the template to be called.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="choose" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Choose is the beginning of a When/Otherwise combination.  It is
-         the way to implement case selection of If/Then/ElseIf type logical
-         processing.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:when" maxOccurs="unbounded"/>
-          <xs:element ref="xsl:otherwise" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="comment" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        Creates a comment node in the result document.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor"/>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="copy" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Copy creates a duplicate of the current node being processed.  It
-         does not copy the attributes or children nodes.  See copy-of for
-         copying attributes and children nodes.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="use-attribute-sets" type="xsl:QNames" default="">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional.  A space separated list of attributes sets to apply to the
-                 result document.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="copy-of" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Creates a copy-of the current node and all attributes, and children nodes.
-         It copies the nodes specified by the XPath selection criteria.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:generic-element-type">
-        <xs:attribute name="select" type="xsl:expression" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Required.  XPath expressions that select the nodes to be copied.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="decimal-format" substitutionGroup="xsl:declaration">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Defines the output format to be used when converting numbers into strings when
-         used with the XPath function format-number().
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:attribute name="name" type="xsl:QName">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional. The unique name for this format.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="decimal-separator" type="xsl:char" default=".">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  The character to use to represent a decimal point.
-                  The default value is a period.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="grouping-separator" type="xsl:char" default=",">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional. The character to be used to seperate thousands.  The
-                  default is a comma.              
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="infinity" type="xs:string" default="Infinity">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional. The string to be used to represent infinity. The default
-                  is Infinity.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="minus-sign" type="xsl:char" default="-">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional. The character to be used to represent negative numbers.
-                  The default is the minus sign.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="NaN" type="xs:string" default="NaN">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  The string to be used when the input is Not a Number.
-                  The default is NaN.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="percent" type="xsl:char" default="%">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional. The character to be used to represent a percent.
-                  The default is a percent sign.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="per-mille" type="xsl:char" default="&#x2030;">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  The character to be used to represet per thousand.
-                  The default is &#x2030;
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="zero-digit" type="xsl:char" default="0">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional. The character to be used to represent the digit zero.
-                  The default is the number zero.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="digit" type="xsl:char" default="#">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                   Optional. The character to be used to indicated where a digit
-                   is required.  The default values is # character.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="pattern-separator" type="xsl:char" default=";">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                   Optional. The character to be used to separate positive and
-                   negative sub-patterns in a pattern.  The default is a semi-colon.                   
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="element" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Creates an element in the result document.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType mixed="true">
-    <xs:complexContent>
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:avt" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Required.  The name of the element to be created.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="namespace" type="xsl:avt">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                   Optional. The namespace the element belongs.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="use-attribute-sets" type="xsl:QNames" default="">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                   Optional.  A space separated list of attribute-set names to 
-                   be included on the element.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="fallback" substitutionGroup="xsl:instruction" type="xsl:sequence-constructor">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-          Specifies alternate code to be run if the XSLT processor doesn't understand
-          a particular xsl element.
-     </xs:documentation>
-  </xs:annotation>
-</xs:element>
-
-<xs:element name="for-each" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         A looping command that processes each node returned from the
-         XPath selection criteria.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:generic-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:sort" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:group ref="xsl:sequence-constructor-group" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="select" type="xsl:expression" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                    Required.  The XPath selection criteria to be used to retrieve the
-                    node set to be processed by the loop.              
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="if" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         A logical construct, that will only be applied when the XPath expression
-         test returns true.  It does not support a Else statement, see Choose
-         for implementing If/Then/ElseIf logic.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="test" type="xsl:expression" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                    Required.  The XPath expression to test the variable or node against.
-                    The statements nested will only be executed if the test returns
-                    true.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="import">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        Allows the inclusion of one stylesheet into another.  If there are
-        templates that are the same in the parent stylesheet that are in the
-        stylesheet being imported, the parent stylesheet's templates will 
-        take precedence.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:attribute name="href" type="xs:anyURI" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Required.  The URI for the stylesheet.  This is either a relative
-                  or physical URI.  If it is relative, it is relative to the location
-                  of the stylesheet.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-
-<xs:element name="include" substitutionGroup="xsl:declaration">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Include brings in another stylesheet into the current one.  Unlike
-         the Import statement, the stylesheet templates have the same precedence
-         as the one being included in to.
-     </xs:documentation>
-  </xs:annotation>
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="xsl:element-only-versioned-element-type">
-          <xs:attribute name="href" type="xs:anyURI" use="required">
-              <xs:annotation>
-                 <xs:documentation source="http://www.w3.org/TR/xslt">
-                     Required.  The URI for the stylesheet.  This is either a relative
-                     or physical URI.  If it is relative, it is relative to the location
-                     of the stylesheet.
-                 </xs:documentation>
-              </xs:annotation>
-          </xs:attribute>
-        </xs:extension>
-      </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="key" substitutionGroup="xsl:declaration">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        A key is a way to index a set of nodes to be retrieved later by the XPath
-        key() function.  It allows faster access to a series of nodes based off of a
-        unique key with in a list of nodes.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:QName" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Required.  The name of the key to be created.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="match" type="xsl:pattern" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  Defines the XPath expression to which the nodes will
-                  be applied.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="use" type="xsl:expression" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                    Required.  The value of the key for each of the nodes.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-</xs:element>
-
-<xs:element name="message" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Writes a message to the output, usually stdout or stderro.  Typically
-         used to report errors during processing.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="terminate" type="xsl:avt" default="no">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  Indicates whether processing should be ended after
-                  producing the message.  The default value is no.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="namespace-alias" substitutionGroup="xsl:declaration">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Allows replacing of a particular namespace from the style sheet to a different
-         namespace when writing the result document.
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:attribute name="stylesheet-prefix" type="xsl:prefix-or-default" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Required.  Specifies the name of the prefix you want to change.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="result-prefix" type="xsl:prefix-or-default" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Required.  Specifies the name of the prefix the result is to use.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="number" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        Used to determine the integer position of the current node.  Also used
-        in formatting a number.     
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:generic-element-type">
-        <xs:attribute name="value" type="xsl:expression">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  A number provided by the implementor instead of
-                  a system generated number.  The position() xpath function can
-                  be used as well.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="level" type="xsl:level" default="single">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional. Specifies how the sequence number is assigned.  Valid values
-                 are single (default), multiple, and any.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="count" type="xsl:pattern">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional.  An XPath expression that indicates what nodes are to be
-                 counted.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="from" type="xsl:pattern">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional.  An XPath expression that indicates where counting will start.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="format" type="xsl:avt" default="1">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional.  The format string in which the number is to be formatted.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="lang" type="xsl:avt">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional.  The language code used to indicate what spoken language is
-                 to be used for the format string.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="letter-value" type="xsl:avt">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional.  Specifies whether the number is alphabetical or traditional.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="grouping-separator" type="xsl:avt">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional. The character to be used to seperate a group of numbers.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="grouping-size" type="xsl:avt">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional. A number indicating the number of digits in a group.  The
-                  default is 3.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="otherwise" type="xsl:sequence-constructor">
-   <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Otherwise is used to indicate the default action when none of the 
-         When tests are true, in a Choose statement.
-     </xs:documentation>
-   </xs:annotation>
-</xs:element>
-
-<xs:element name="output" substitutionGroup="xsl:declaration">
-   <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Specifies the format for the result document.
-     </xs:documentation>
-   </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:generic-element-type">
-        <xs:attribute name="method" type="xsl:method">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional.  Valid values are xml, html, and text.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="cdata-section-elements" type="xsl:QNames">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional. A space separated list of elements whose content should
-                 be wrapped with CDATA.                
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="doctype-public" type="xs:string">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional. Sets the value of the Public doctype attribute.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="doctype-system" type="xs:string">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional. Sets the value of the System doctype attribute.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="encoding" type="xs:string">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional. Specifies the type of encoding to use.  i.e. UTF-8, UTF-16, etc.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="indent" type="xsl:yes-or-no">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional. Should the result document be pretty-printed.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="media-type" type="xs:string">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional. The mime type of the result document.  i.e. text/xml
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="omit-xml-declaration" type="xsl:yes-or-no">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  Whether the xml declation should be created in the 
-                  result document.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="standalone" type="xsl:yes-or-no-or-omit">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional. Indicates if a standalone declartion should occcur in the
-                 result document.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="version" type="xs:NMTOKEN">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional. Sets the W3C version number to be used with the
-                 result document.  Only used for HTML or XML output.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="param">
-     <xs:annotation>
-        <xs:documentation source="http://www.w3.org/TR/xslt">
-            Used to declare a local or global parameter.
-        </xs:documentation>
-     </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:QName" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Required.  The name of the parameter to be created.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="select" type="xsl:expression">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  An XPath expression to be used to populate the parameter
-                  if nothing is passed to it.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-
-<xs:element name="preserve-space" substitutionGroup="xsl:declaration">
-   <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Indicates the elements that are to have white space preserved when
-         creating the result document.
-     </xs:documentation>
-   </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:attribute name="elements" type="xsl:nametests" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  A space seperated list of elements in which
-                  white space is significant and should be preserved when
-                  creating the result document.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="processing-instruction" substitutionGroup="xsl:instruction">
-   <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         Creates a processing instruction in the result document.
-     </xs:documentation>
-   </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:avt" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Required.  The name of the processing instruction to be created.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="sort">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        Sorts the output of the node set.
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="select" type="xsl:expression">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional.  Specifies the XPath expression to be used to create the nodeset
-                 to be sorted.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>  
-        <xs:attribute name="lang" type="xsl:avt">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional. The language code to be used for sorting.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>        
-        <xs:attribute name="data-type" type="xsl:avt" default="text">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  The type of data that is being sorted. The default
-                  is text.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>        
-        <xs:attribute name="order" type="xsl:avt" default="ascending">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  The order in which the data is to be sorted.  The
-                  default is ascending.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>        
-        <xs:attribute name="case-order" type="xsl:avt">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  Specifies if upper or lowercase letters are to 
-                  be sorted first.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="strip-space" substitutionGroup="xsl:declaration">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        Defines which elements are to have white space stripped when
-        writing the result document.     
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:attribute name="elements" type="xsl:nametests" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Required.  A space separeated list of elements are to have
-                 white space removed when writing the result document.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="stylesheet" substitutionGroup="xsl:transform">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         The root element of a style sheet.  Also see the transform element.
-         Either stylesheet or transform can be used.  Typically stylsheet is
-         used.
-     </xs:documentation>
-  </xs:annotation>
-</xs:element>
-
-<xs:element name="template" substitutionGroup="xsl:declaration">
-   <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        A template contains processing instructions and commands for nodes in the
-        input document that match the specified XPath expression.
-     </xs:documentation>
-   </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:generic-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:param" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:group ref="xsl:sequence-constructor-group" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="match" type="xsl:pattern">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional. An XPath expression or expressions that this template will
-                 be applied to.  Note if this is omitted, then a name attribute must
-                 be used.  Either a namoe or a match are to be used, but not both.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="priority" type="xs:decimal">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  Indicates the numeric priortity for processing the
-                  template.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="mode" type="xsl:modes">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  The name of the mode for this template.  Used to match
-                  up with the apply-templates mode attribute.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="name" type="xsl:QName">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  The name of a called template.  Note that if name is
-                  not used, then match must be used.  You can have one or the other
-                  but not both.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:complexType name="text-element-base-type">
-  <xs:simpleContent>
-    <xs:restriction base="xsl:generic-element-type">
-
-      <xs:simpleType>
-        <xs:restriction base="xs:string"/>
-      </xs:simpleType>
-      <xs:anyAttribute namespace="##other" processContents="skip"/>
-    </xs:restriction>
-  </xs:simpleContent>
-</xs:complexType>
-
-<xs:element name="text" substitutionGroup="xsl:instruction">
-   <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        Writes text data to the output.  i.e. #PCData
-     </xs:documentation>
-   </xs:annotation>
-  <xs:complexType>
-    <xs:simpleContent>
-      <xs:extension base="xsl:text-element-base-type">
-        <xs:attribute name="disable-output-escaping" type="xsl:yes-or-no" default="no">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional.  Indicates if non friendly html and xml content should be converted
-                 to their entity types.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:complexType name="transform-element-base-type">
-  <xs:complexContent>
-    <xs:extension base="xsl:element-only-versioned-element-type">
-      <xs:attribute name="version" type="xs:decimal" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Required.  The version number corresponding the the
-                 XSLT specification being used.  For XSLT 1.0, this will
-                 be 1.0.
-              </xs:documentation>
-           </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="exclude-result-prefixes" type="xsl:prefixes" use="optional">
-      	<xs:annotation>
-      		<xs:documentation source="http:/www.w3.org/TR/xslt">
-      			Optional. A list of namespace prefixes to exclude from the result document.
-      		</xs:documentation>
-      	</xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="extension-element-prefixes" type="xsl:prefixes" use="optional">
-         <xs:annotation>
-            <xs:documentation source="http:/www.w3.org/TR/xslt">
-               Optional.  A list of extension namespace prefixes.  This is used to identify namespaces that
-               contain XSLT processor extensions.
-            </xs:documentation>
-         </xs:annotation>
-      </xs:attribute>
-      <xs:anyAttribute namespace="##other" processContents="skip"/>
-    </xs:extension>
-  </xs:complexContent>
-</xs:complexType>
-
-<xs:element name="transform">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         The root element of a style sheet.  Also see the stylesheet element.
-         Either stylesheet or transform can be used.  Typically stylsheet is
-         used.
-     </xs:documentation>
-  </xs:annotation>
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:transform-element-base-type">
-        <xs:sequence>
-          <xs:element ref="xsl:import" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element ref="xsl:declaration"/>
-            <xs:element ref="xsl:variable"/>
-            <xs:element ref="xsl:param"/>              
-            <xs:any namespace="##other" processContents="skip"/> <!-- weaker than XSLT 1.0 -->
-          </xs:choice>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Optional.  A unique ID for the stylesheet.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="value-of" substitutionGroup="xsl:instruction">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        Used to pull the data value from the selected node or XPath expression.
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="select" type="xsl:expression" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Required.  The XPath expression or current node to be used
-                 to pull the data from.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="disable-output-escaping" type="xsl:yes-or-no" default="no">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional. Whether non-xml friendly data should be entity escaped.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="variable">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        Declares a local or global variable to be used during processing.
-        The contents of variable can be populated by either a series of
-        XSLT commands or XPath expressions.
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:QName" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 Required.  The name of the variable.  This is how the
-                 variable is accessed later in the stylesheet.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="select" type="xsl:expression" use="optional">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  The XPath expression in which the variable is
-                  populated from.  This specifies where the variable is to get
-                  it's data value from.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="when">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-         A conditional statement similiar to an if statement, used to test
-         if a particular expression is true or false.  Use with the Choose and
-         Other wise elements.
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="test" type="xsl:expression" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                 An XPath expression that tests to true or false.  If true
-                 the statements within are executed.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="with-param">
-  <xs:annotation>
-     <xs:documentation source="http://www.w3.org/TR/xslt">
-        Defines the value of a parameter to be passed to a called template.
-     </xs:documentation>
-  </xs:annotation>
-
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:QName" use="required">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Required.  The name of the parameter to be set.  This
-                  must exist in the template that is being called.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="select" type="xsl:expression">
-           <xs:annotation>
-              <xs:documentation source="http://www.w3.org/TR/xslt">
-                  Optional.  An XPath expression that is used to set
-                  the value for the parameter being passed to a template.
-              </xs:documentation>
-           </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-<xs:annotation>
-  <xs:documentation>
-    PART C: definition of literal result elements
-    
-    There are three ways to define the literal result elements
-    permissible in a stylesheet.
-    
-    (a) do nothing. This allows any element to be used as a literal
-        result element, provided it is not in the XSLT namespace
-    
-    (b) declare all permitted literal result elements as members
-        of the xsl:literal-result-element substitution group
-        
-    (c) redefine the model group xsl:result-elements to accommodate
-        all permitted literal result elements.
-        
-    Literal result elements are allowed to take certain attributes
-    in the XSLT namespace. These are defined in the attribute group
-    literal-result-element-attributes, which can be included in the
-    definition of any literal result element.
-    
-  </xs:documentation>
-
-</xs:annotation>   
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-<xs:element name="literal-result-element" abstract="true" type="xs:anyType"/>
-
-<xs:attributeGroup name="literal-result-element-attributes">
-  <xs:attribute name="default-collation" form="qualified" type="xsl:uri-list"/>
-  <xs:attribute name="extension-element-prefixes" form="qualified" type="xsl:prefixes"/>
-  <xs:attribute name="exclude-result-prefixes" form="qualified" type="xsl:prefixes"/>
-  <xs:attribute name="xpath-default-namespace" form="qualified" type="xs:anyURI"/>    
-  <xs:attribute name="inherit-namespaces" form="qualified" type="xsl:yes-or-no" default="yes"/>
-  <xs:attribute name="use-attribute-sets" form="qualified" type="xsl:QNames" default=""/>
-
-  <xs:attribute name="use-when" form="qualified" type="xsl:expression"/>
-  <xs:attribute name="version" form="qualified" type="xs:decimal"/>
-  <xs:attribute name="type" form="qualified" type="xsl:QName"/>
-  <xs:attribute name="validation" form="qualified" type="xsl:validation-type"/>
-</xs:attributeGroup>
-
-<xs:group name="result-elements">
-  <xs:choice>
-    <xs:element ref="xsl:literal-result-element"/>
-    <xs:any namespace="##other" processContents="skip"/>
-
-    <xs:any namespace="##local" processContents="skip"/>
-  </xs:choice>
-</xs:group>
-
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-<xs:annotation>
-  <xs:documentation>
-    PART D: definitions of simple types used in stylesheet attributes 
-  </xs:documentation>
-</xs:annotation>   
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-<xs:simpleType name="avt">
-  <xs:annotation>
-    <xs:documentation>
-      This type is used for all attributes that allow an attribute value template.
-      The general rules for the syntax of attribute value templates, and the specific
-      rules for each such attribute, are described in the XSLT 2.0 Recommendation.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:string"/>
-</xs:simpleType>
-
-<xs:simpleType name="char">
-  <xs:annotation>
-
-    <xs:documentation>
-      A string containing exactly one character.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:string">
-    <xs:length value="1"/>
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="expression">
-  <xs:annotation>
-
-    <xs:documentation>
-      An XPath 2.0 expression.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-    <xs:pattern value=".+"/>
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="input-type-annotations-type">
-  <xs:annotation>
-
-    <xs:documentation>
-      Describes how type annotations in source documents are handled.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-    <xs:enumeration value="preserve"/>
-    <xs:enumeration value="strip"/>   
-    <xs:enumeration value="unspecified"/>        
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="level">
-  <xs:annotation>
-    <xs:documentation>
-      The level attribute of xsl:number: 
-      one of single, multiple, or any.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:NCName">
-    <xs:enumeration value="single"/>
-    <xs:enumeration value="multiple"/>
-    <xs:enumeration value="any"/>
-
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="mode">
-  <xs:annotation>
-    <xs:documentation>
-      The mode attribute of xsl:apply-templates: 
-      either a QName, or #current, or #default.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:union memberTypes="xsl:QName">
-    <xs:simpleType>
-
-      <xs:restriction base="xs:token">
-        <xs:enumeration value="#default"/>
-        <xs:enumeration value="#current"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:union>
-</xs:simpleType>
-
-<xs:simpleType name="modes">
-  <xs:annotation>
-
-    <xs:documentation>
-      The mode attribute of xsl:template: 
-      either a list, each member being either a QName or #default;
-      or the value #all
-    </xs:documentation>
-  </xs:annotation>
-  <xs:union>
-    <xs:simpleType>
-      <xs:list>
-        <xs:simpleType>
-          <xs:union memberTypes="xsl:QName">
-
-            <xs:simpleType>
-              <xs:restriction base="xs:token">
-                <xs:enumeration value="#default"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:union>
-        </xs:simpleType>
-      </xs:list>
-    </xs:simpleType>
-
-    <xs:simpleType>
-      <xs:restriction base="xs:token">
-        <xs:enumeration value="#all"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:union>
-</xs:simpleType>
-
-<xs:simpleType name="nametests">
-  <xs:annotation>
-
-    <xs:documentation>
-      A list of NameTests, as defined in the XPath 2.0 Recommendation.
-      Each NameTest is either a QName, or "*", or "prefix:*", or "*:localname"
-    </xs:documentation>
-  </xs:annotation>
-  <xs:list>
-    <xs:simpleType>
-      <xs:union memberTypes="xsl:QName">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-
-            <xs:enumeration value="*"/>
-          </xs:restriction>
-        </xs:simpleType>
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:pattern value="\i\c*:\*"/>
-            <xs:pattern value="\*:\i\c*"/>            
-          </xs:restriction>
-        </xs:simpleType>
-
-      </xs:union>
-    </xs:simpleType>
-  </xs:list>
-</xs:simpleType>
-
-<xs:simpleType name="prefixes">
-  <xs:list itemType="xs:NCName"/>
-</xs:simpleType>
-
-<xs:simpleType name="prefix-list-or-all">
-  <xs:union memberTypes="xsl:prefix-list">
-    <xs:simpleType>
-
-      <xs:restriction base="xs:token">
-        <xs:enumeration value="#all"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:union>
-</xs:simpleType>
-      
-<xs:simpleType name="prefix-list">
-  <xs:list itemType="xsl:prefix-or-default"/>
-</xs:simpleType>
-
-<xs:simpleType name="method">
-  <xs:annotation>
-    <xs:documentation>
-      The method attribute of xsl:output:
-      Either one of the recognized names "xml", "xhtml", "html", "text",
-      or a QName that must include a prefix.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:union>
-    <xs:simpleType>
-      <xs:restriction base="xs:NCName">
-        <xs:enumeration value="xml"/>
-
-        <xs:enumeration value="xhtml"/>
-        <xs:enumeration value="html"/>
-        <xs:enumeration value="text"/>
-      </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType>
-      <xs:restriction base="xsl:QName">
-        <xs:pattern value="\c*:\c*"/>
-      </xs:restriction>
-
-    </xs:simpleType>
-  </xs:union>
-</xs:simpleType>
-
-<xs:simpleType name="pattern">
-  <xs:annotation>
-    <xs:documentation>
-      A match pattern as defined in the XSLT 2.0 Recommendation.
-      The syntax for patterns is a restricted form of the syntax for
-      XPath 2.0 expressions.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xsl:expression"/>
-
-</xs:simpleType>
-
-<xs:simpleType name="prefix-or-default">
-  <xs:annotation>
-    <xs:documentation>
-      Either a namespace prefix, or #default.
-      Used in the xsl:namespace-alias element.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:union memberTypes="xs:NCName">
-    <xs:simpleType>
-      <xs:restriction base="xs:token">
-
-        <xs:enumeration value="#default"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:union>
-</xs:simpleType>
-
-<xs:simpleType name="QNames">
-  <xs:annotation>
-    <xs:documentation>
-      A list of QNames.
-      Used in the [xsl:]use-attribute-sets attribute of various elements,
-      and in the cdata-section-elements attribute of xsl:output
-    </xs:documentation>
-
-  </xs:annotation>
-  <xs:list itemType="xsl:QName"/>          
-</xs:simpleType>
-
-<xs:simpleType name="QName">
-  <xs:annotation>
-    <xs:documentation>
-      A QName.
-      This schema does not use the built-in type xs:QName, but rather defines its own
-      QName type. Although xs:QName would define the correct validation on these attributes,
-      a schema processor would expand unprefixed QNames incorrectly when constructing the PSVI,
-      because (as defined in XML Schema errata) an unprefixed xs:QName is assumed to be in
-      the default namespace, which is not the correct assumption for XSLT.
-      The data type is defined as a restriction of the built-in type Name, restricted
-      so that it can only contain one colon which must not be the first or last character.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:Name">
-
-    <xs:pattern value="([^:]+:)?[^:]+"/>      
-  </xs:restriction>        
-</xs:simpleType>
-
-<xs:simpleType name="sequence-type">
-  <xs:annotation>
-    <xs:documentation>
-      The description of a data type, conforming to the
-      SequenceType production defined in the XPath 2.0 Recommendation
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-
-    <xs:pattern value=".+"/>      
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="uri-list">
-  <xs:list itemType="xs:anyURI"/>
-</xs:simpleType>
-
-<xs:simpleType name="validation-strip-or-preserve">
-  <xs:annotation>
-    <xs:documentation>
-      Describes different ways of type-annotating an element or attribute.
-    </xs:documentation>
-
-  </xs:annotation>
-  <xs:restriction base="xsl:validation-type">
-    <xs:enumeration value="preserve"/>
-    <xs:enumeration value="strip"/>    
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="validation-type">
-  <xs:annotation>
-    <xs:documentation>
-      Describes different ways of type-annotating an element or attribute.
-    </xs:documentation>
-
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-    <xs:enumeration value="strict"/>
-    <xs:enumeration value="lax"/>
-    <xs:enumeration value="preserve"/>
-    <xs:enumeration value="strip"/>    
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="yes-or-no">
-  <xs:annotation>
-
-    <xs:documentation>
-      One of the values "yes" or "no".
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-    <xs:enumeration value="yes"/>
-    <xs:enumeration value="no"/>
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="yes-or-no-or-omit">
-  <xs:annotation>
-    <xs:documentation>
-      One of the values "yes" or "no" or "omit".
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-    <xs:enumeration value="yes"/>
-    <xs:enumeration value="no"/>
-    <xs:enumeration value="omit"/>
-
-  </xs:restriction>
-</xs:simpleType>
-
-</xs:schema>
diff --git a/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xslt-2.0.xsd b/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xslt-2.0.xsd
deleted file mode 100644
index 91fd200..0000000
--- a/bundles/org.eclipse.wst.xsl.core/xslt-schemas/xslt-2.0.xsd
+++ /dev/null
@@ -1,1173 +0,0 @@
-<?xml version="1.0"?>
-<!-- 
- *******************************************************************************
- * Copyright (c) 2001, 2007 - W3C, 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 - 20080330 - STAR - bug 224819 - changed procesContents from lax to skip
- *******************************************************************************
-*******************************************************************************
- * W3C® SOFTWARE NOTICE AND LICENSE
- * http://www.w3.org/Consortium/Legal/copyright-software-19980720
- *
- * Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of
- * Technology, Institut National de Recherche en Informatique et en Automatique,
- * Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
- *
- * This W3C work (including software, documents, or other related items) is being
- * provided by the copyright holders under the following license. By obtaining,
- * using and/or copying this work, you (the licensee) agree that you have read,
- * understood, and will comply with the following terms and conditions:
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation, with or without modification,  for any purpose and without fee
- * or royalty is hereby granted, provided that you include the following on ALL copies
- * of the software and documentation or portions thereof, including modifications, that
- * you make:
- *
- *  1. The full text of this NOTICE in a location viewable to users of the redistributed
- *     or derivative work.
- *  2. Any pre-existing intellectual property disclaimers, notices, or terms and
- *     conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
- *  3. Notice of any changes or modifications to the W3C files, including the date changes
- *     were made. (We recommend you provide URIs to the location from which the code is
- *     derived.)
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO 
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
- * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
- * THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
- * TRADEMARKS OR OTHER RIGHTS.
- *
- * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL
- * DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
- *
- * The name and trademarks of copyright holders may NOT be used in advertising or publicity
- * pertaining to the software without specific, written prior permission. Title to copyright
- * in this software and any associated documentation will at all times remain with copyright
- * holders.
- ********************************************************************************************
- -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.w3.org/1999/XSL/Transform" elementFormDefault="qualified" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-<xs:annotation>
-  <xs:documentation>
-  
-    This is a schema for XSLT 2.0 stylesheets.
-    
-    It defines all the elements that appear in the XSLT namespace; it also
-    provides hooks that allow the inclusion of user-defined literal result elements,
-    extension instructions, and top-level data elements.
-    
-    The schema is derived (with kind permission) from a schema for XSLT 1.0 stylesheets
-    produced by Asir S Vedamuthu of WebMethods Inc.
-    
-    This schema is available for use under the conditions of the W3C Software License
-    published at http://www.w3.org/Consortium/Legal/copyright-software-19980720
-    
-    The schema is organized as follows:
-    
-    PART A: definitions of complex types and model groups used as the basis 
-            for element definitions
-    PART B: definitions of individual XSLT elements
-    PART C: definitions for literal result elements
-    PART D: definitions of simple types used in attribute definitions
-    
-    This schema does not attempt to define all the constraints that apply to a valid
-    XSLT 2.0 stylesheet module. It is the intention that all valid stylesheet modules 
-    should conform to this schema; however, the schema is non-normative and in the event 
-    of any conflict, the text of the Recommendation takes precedence.
-
-    This schema does not implement the special rules that apply when a stylesheet
-    has sections that use forwards-compatible-mode. In this mode, setting version="3.0"
-    allows elements from the XSLT namespace to be used that are not defined in XSLT 2.0.
-
-    Simplified stylesheets (those with a literal result element as the outermost element)
-    will validate against this schema only if validation starts in lax mode.
-    
-    This version is dated 2005-02-11
-    Authors: Michael H Kay, Saxonica Limited
-             Jeni Tennison, Jeni Tennison Consulting Ltd.
-    
-  </xs:documentation>
-</xs:annotation>   
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
- 
-<!--
-The declaration of xml:space and xml:lang may need to be commented out because
-of problems processing the schema using various tools
--->
-      
-<xs:import namespace="http://www.w3.org/XML/1998/namespace" 
-  schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-<!-- 
-    An XSLT stylesheet may contain an in-line schema within an xsl:import-schema element,
-    so the Schema for schemas needs to be imported
--->
-  
-<xs:import namespace="http://www.w3.org/2001/XMLSchema"
-                  schemaLocation="http://www.w3.org/2001/XMLSchema.xsd"/>
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-<xs:annotation>
-  <xs:documentation>
-    PART A: definitions of complex types and model groups used as the basis 
-            for element definitions
-  </xs:documentation>
-</xs:annotation>   
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-<xs:complexType name="generic-element-type" mixed="true">
-  <xs:attribute name="default-collation" type="xsl:uri-list"/>
-  <xs:attribute name="exclude-result-prefixes" type="xsl:prefix-list-or-all"/>
-  <xs:attribute name="extension-element-prefixes" type="xsl:prefix-list"/>
-  <xs:attribute name="use-when" type="xsl:expression"/>
-  <xs:attribute name="xpath-default-namespace" type="xs:anyURI"/>
-  <xs:anyAttribute namespace="##other" processContents="skip"/>
-</xs:complexType>
-
-<xs:complexType name="versioned-element-type" mixed="true">
-  <xs:complexContent>
-    <xs:extension base="xsl:generic-element-type">    
-      <xs:attribute name="version" type="xs:decimal" use="optional"/>
-    </xs:extension>
-  </xs:complexContent>
-</xs:complexType>
-
-<xs:complexType name="element-only-versioned-element-type" mixed="false">
-  <xs:complexContent>
-    <xs:restriction base="xsl:versioned-element-type">
-      <xs:anyAttribute namespace="##other" processContents="skip"/>
-    </xs:restriction>
-  </xs:complexContent>
-</xs:complexType>
-
-<xs:complexType name="sequence-constructor">
-  <xs:complexContent mixed="true">
-    <xs:extension base="xsl:versioned-element-type">    
-      <xs:group ref="xsl:sequence-constructor-group" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:extension>
-  </xs:complexContent>
-</xs:complexType>
-
-<xs:group name="sequence-constructor-group">
-  <xs:choice>
-    <xs:element ref="xsl:variable"/>
-    <xs:element ref="xsl:instruction"/>
-    <xs:group ref="xsl:result-elements"/>
-  </xs:choice>
-</xs:group>
-
-<xs:element name="declaration" type="xsl:generic-element-type" abstract="true"/>
-
-<xs:element name="instruction" type="xsl:versioned-element-type" abstract="true"/>
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-<xs:annotation>
-  <xs:documentation>
-    PART B: definitions of individual XSLT elements    
-    Elements are listed in alphabetical order.    
-  </xs:documentation>
-</xs:annotation>   
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-<xs:element name="analyze-string" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:matching-substring" minOccurs="0"/>
-          <xs:element ref="xsl:non-matching-substring" minOccurs="0"/>
-          <xs:element ref="xsl:fallback" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="select" type="xsl:expression" use="required"/>
-        <xs:attribute name="regex" type="xsl:avt" use="required"/>
-        <xs:attribute name="flags" type="xsl:avt" default=""/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="apply-imports" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:with-param" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="apply-templates" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="xsl:sort"/>
-          <xs:element ref="xsl:with-param"/>
-        </xs:choice>
-        <xs:attribute name="select" type="xsl:expression" default="child::node()"/>
-        <xs:attribute name="mode" type="xsl:mode"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="attribute" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:avt" use="required"/>
-        <xs:attribute name="namespace" type="xsl:avt"/>
-        <xs:attribute name="select" type="xsl:expression"/>
-        <xs:attribute name="separator" type="xsl:avt"/>   
-        <xs:attribute name="type" type="xsl:QName"/>
-        <xs:attribute name="validation" type="xsl:validation-type"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>        
-
-<xs:element name="attribute-set" substitutionGroup="xsl:declaration">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:sequence minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="xsl:attribute"/>
-        </xs:sequence>
-        <xs:attribute name="name" type="xsl:QName" use="required"/>
-        <xs:attribute name="use-attribute-sets" type="xsl:QNames" default=""/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="call-template" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:with-param" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="name" type="xsl:QName" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="character-map" substitutionGroup="xsl:declaration">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:output-character" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="name" type="xsl:QName" use="required"/>
-        <xs:attribute name="use-character-maps" type="xsl:QNames" default=""/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="choose" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:when" maxOccurs="unbounded"/>
-          <xs:element ref="xsl:otherwise" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="comment" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="select" type="xsl:expression"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="copy" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="copy-namespaces" type="xsl:yes-or-no" default="yes"/>
-        <xs:attribute name="inherit-namespaces" type="xsl:yes-or-no" default="yes"/>
-        <xs:attribute name="use-attribute-sets" type="xsl:QNames" default=""/>
-        <xs:attribute name="type" type="xsl:QName"/>
-        <xs:attribute name="validation" type="xsl:validation-type"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="copy-of" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:versioned-element-type">
-        <xs:attribute name="select" type="xsl:expression" use="required"/>
-        <xs:attribute name="copy-namespaces" type="xsl:yes-or-no" default="yes"/>
-        <xs:attribute name="type" type="xsl:QName"/>
-        <xs:attribute name="validation" type="xsl:validation-type"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="decimal-format" substitutionGroup="xsl:declaration">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:attribute name="name" type="xsl:QName"/>
-        <xs:attribute name="decimal-separator" type="xsl:char" default="."/>
-        <xs:attribute name="grouping-separator" type="xsl:char" default=","/>
-        <xs:attribute name="infinity" type="xs:string" default="Infinity"/>
-        <xs:attribute name="minus-sign" type="xsl:char" default="-"/>
-        <xs:attribute name="NaN" type="xs:string" default="NaN"/>
-        <xs:attribute name="percent" type="xsl:char" default="%"/>
-        <xs:attribute name="per-mille" type="xsl:char" default="&#x2030;"/>
-        <xs:attribute name="zero-digit" type="xsl:char" default="0"/>
-        <xs:attribute name="digit" type="xsl:char" default="#"/>
-        <xs:attribute name="pattern-separator" type="xsl:char" default=";"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="element" substitutionGroup="xsl:instruction">
-  <xs:complexType mixed="true">
-    <xs:complexContent>
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:avt" use="required"/>
-        <xs:attribute name="namespace" type="xsl:avt"/>
-        <xs:attribute name="inherit-namespaces" type="xsl:yes-or-no" default="yes"/>
-        <xs:attribute name="use-attribute-sets" type="xsl:QNames" default=""/>
-        <xs:attribute name="type" type="xsl:QName"/>
-        <xs:attribute name="validation" type="xsl:validation-type"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="fallback" substitutionGroup="xsl:instruction" type="xsl:sequence-constructor"/>
-
-<xs:element name="for-each" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:sort" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:group ref="xsl:sequence-constructor-group" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="select" type="xsl:expression" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="for-each-group" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:sort" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:group ref="xsl:sequence-constructor-group" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="select" type="xsl:expression" use="required"/>
-        <xs:attribute name="group-by" type="xsl:expression"/>
-        <xs:attribute name="group-adjacent" type="xsl:expression"/>            
-        <xs:attribute name="group-starting-with" type="xsl:pattern"/>            
-        <xs:attribute name="group-ending-with" type="xsl:pattern"/>            
-        <xs:attribute name="collation" type="xs:anyURI"/>            
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="function" substitutionGroup="xsl:declaration">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:param" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:group ref="xsl:sequence-constructor-group" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="name" type="xsl:QName" use="required"/>
-        <xs:attribute name="override" type="xsl:yes-or-no" default="yes"/>
-        <xs:attribute name="as" type="xsl:sequence-type" default="item()*"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="if" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="test" type="xsl:expression" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="import">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:attribute name="href" type="xs:anyURI" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="import-schema" substitutionGroup="xsl:declaration">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xs:schema" minOccurs="0" maxOccurs="1"/>
-        </xs:sequence>
-        <xs:attribute name="namespace" type="xs:anyURI"/>
-        <xs:attribute name="schema-location" type="xs:anyURI"/>                  
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="include" substitutionGroup="xsl:declaration">
-    <xs:complexType>
-      <xs:complexContent>
-        <xs:extension base="xsl:element-only-versioned-element-type">
-          <xs:attribute name="href" type="xs:anyURI" use="required"/>
-        </xs:extension>
-      </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="key" substitutionGroup="xsl:declaration">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:QName" use="required"/>
-        <xs:attribute name="match" type="xsl:pattern" use="required"/>
-        <xs:attribute name="use" type="xsl:expression"/>
-        <xs:attribute name="collation" type="xs:anyURI"/>               
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="matching-substring" type="xsl:sequence-constructor"/>
-
-<xs:element name="message" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="select" type="xsl:expression"/>
-        <xs:attribute name="terminate" type="xsl:avt" default="no"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="namespace" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:avt" use="required"/>
-        <xs:attribute name="select" type="xsl:expression"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="namespace-alias" substitutionGroup="xsl:declaration">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:attribute name="stylesheet-prefix" type="xsl:prefix-or-default" use="required"/>
-        <xs:attribute name="result-prefix" type="xsl:prefix-or-default" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="next-match" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element ref="xsl:with-param"/>
-          <xs:element ref="xsl:fallback"/>
-        </xs:choice>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="non-matching-substring" type="xsl:sequence-constructor"/>
-
-<xs:element name="number" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:versioned-element-type">
-        <xs:attribute name="value" type="xsl:expression"/>
-        <xs:attribute name="select" type="xsl:expression"/>
-        <xs:attribute name="level" type="xsl:level" default="single"/>
-        <xs:attribute name="count" type="xsl:pattern"/>
-        <xs:attribute name="from" type="xsl:pattern"/>
-        <xs:attribute name="format" type="xsl:avt" default="1"/>
-        <xs:attribute name="lang" type="xsl:avt"/>
-        <xs:attribute name="letter-value" type="xsl:avt"/>
-        <xs:attribute name="ordinal" type="xsl:avt"/>        
-        <xs:attribute name="grouping-separator" type="xsl:avt"/>
-        <xs:attribute name="grouping-size" type="xsl:avt"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="otherwise" type="xsl:sequence-constructor"/>
-
-<xs:element name="output" substitutionGroup="xsl:declaration">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:generic-element-type">
-        <xs:attribute name="name" type="xsl:QName"/>
-        <xs:attribute name="method" type="xsl:method"/>
-        <xs:attribute name="byte-order-mark" type="xsl:yes-or-no"/>
-        <xs:attribute name="cdata-section-elements" type="xsl:QNames"/>
-        <xs:attribute name="doctype-public" type="xs:string"/>
-        <xs:attribute name="doctype-system" type="xs:string"/>
-        <xs:attribute name="encoding" type="xs:string"/>
-        <xs:attribute name="escape-uri-attributes" type="xsl:yes-or-no"/>
-        <xs:attribute name="include-content-type" type="xsl:yes-or-no"/>
-        <xs:attribute name="indent" type="xsl:yes-or-no"/>
-        <xs:attribute name="media-type" type="xs:string"/>
-        <xs:attribute name="normalization-form" type="xs:NMTOKEN"/>
-        <xs:attribute name="omit-xml-declaration" type="xsl:yes-or-no"/>
-        <xs:attribute name="standalone" type="xsl:yes-or-no-or-omit"/>
-        <xs:attribute name="undeclare-prefixes" type="xsl:yes-or-no"/>
-        <xs:attribute name="use-character-maps" type="xsl:QNames"/>
-        <xs:attribute name="version" type="xs:NMTOKEN"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="output-character">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:attribute name="character" type="xsl:char" use="required"/>
-        <xs:attribute name="string" type="xs:string" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="param">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:QName" use="required"/>
-        <xs:attribute name="select" type="xsl:expression"/>
-        <xs:attribute name="as" type="xsl:sequence-type"/>
-        <xs:attribute name="required" type="xsl:yes-or-no"/>
-        <xs:attribute name="tunnel" type="xsl:yes-or-no"/>        
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="perform-sort" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:sort" minOccurs="1" maxOccurs="unbounded"/>
-          <xs:group ref="xsl:sequence-constructor-group" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="select" type="xsl:expression"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="preserve-space" substitutionGroup="xsl:declaration">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:attribute name="elements" type="xsl:nametests" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="processing-instruction" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:avt" use="required"/>
-        <xs:attribute name="select" type="xsl:expression"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="result-document" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="format" type="xsl:QName"/>
-        <xs:attribute name="href" type="xsl:avt"/>
-        <xs:attribute name="type" type="xsl:QName"/>
-        <xs:attribute name="validation" type="xsl:validation-type"/>
-        <xs:attribute name="method" type="xsl:avt"/>
-        <xs:attribute name="byte-order-mark" type="xsl:avt"/>
-        <xs:attribute name="cdata-section-elements" type="xsl:avt"/>
-        <xs:attribute name="doctype-public" type="xsl:avt"/>
-        <xs:attribute name="doctype-system" type="xsl:avt"/>
-        <xs:attribute name="encoding" type="xsl:avt"/>
-        <xs:attribute name="escape-uri-attributes" type="xsl:avt"/>
-        <xs:attribute name="include-content-type" type="xsl:avt"/>
-        <xs:attribute name="indent" type="xsl:avt"/>
-        <xs:attribute name="media-type" type="xsl:avt"/>
-        <xs:attribute name="normalization-form" type="xsl:avt"/>
-        <xs:attribute name="omit-xml-declaration" type="xsl:avt"/>
-        <xs:attribute name="standalone" type="xsl:avt"/>
-        <xs:attribute name="undeclare-prefixes" type="xsl:avt"/>
-        <xs:attribute name="use-character-maps" type="xsl:QNames"/>
-        <xs:attribute name="output-version" type="xsl:avt"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="sequence" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="select" type="xsl:expression"/>
-        <xs:attribute name="as" type="xsl:sequence-type"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="sort">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="select" type="xsl:expression"/>  
-        <xs:attribute name="lang" type="xsl:avt"/>        
-        <xs:attribute name="data-type" type="xsl:avt" default="text"/>        
-        <xs:attribute name="order" type="xsl:avt" default="ascending"/>        
-        <xs:attribute name="case-order" type="xsl:avt"/>
-        <xs:attribute name="collation" type="xsl:avt"/>
-        <xs:attribute name="stable" type="xsl:yes-or-no"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="strip-space" substitutionGroup="xsl:declaration">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:element-only-versioned-element-type">
-        <xs:attribute name="elements" type="xsl:nametests" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="stylesheet" substitutionGroup="xsl:transform"/>
-
-<xs:element name="template" substitutionGroup="xsl:declaration">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:versioned-element-type">
-        <xs:sequence>
-          <xs:element ref="xsl:param" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:group ref="xsl:sequence-constructor-group" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="match" type="xsl:pattern"/>
-        <xs:attribute name="priority" type="xs:decimal"/>
-        <xs:attribute name="mode" type="xsl:modes"/>
-        <xs:attribute name="name" type="xsl:QName"/>
-        <xs:attribute name="as" type="xsl:sequence-type" default="item()*"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:complexType name="text-element-base-type">
-  <xs:simpleContent>
-    <xs:restriction base="xsl:versioned-element-type">
-      <xs:simpleType>
-        <xs:restriction base="xs:string"/>
-      </xs:simpleType>
-      <xs:anyAttribute namespace="##other" processContents="skip"/>
-    </xs:restriction>
-  </xs:simpleContent>
-</xs:complexType>
-
-<xs:element name="text" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:simpleContent>
-      <xs:extension base="xsl:text-element-base-type">
-        <xs:attribute name="disable-output-escaping" type="xsl:yes-or-no" default="no"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:complexType name="transform-element-base-type">
-  <xs:complexContent>
-    <xs:restriction base="xsl:element-only-versioned-element-type">
-      <xs:attribute name="version" type="xs:decimal" use="required"/>
-      <xs:anyAttribute namespace="##other" processContents="skip"/>
-    </xs:restriction>
-  </xs:complexContent>
-</xs:complexType>
-
-<xs:element name="transform">
-  <xs:complexType>
-    <xs:complexContent>
-      <xs:extension base="xsl:transform-element-base-type">
-        <xs:sequence>
-          <xs:element ref="xsl:import" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:element ref="xsl:declaration"/>
-            <xs:element ref="xsl:variable"/>
-            <xs:element ref="xsl:param"/>              
-            <xs:any namespace="##other" processContents="skip"/> <!-- weaker than XSLT 1.0 -->
-          </xs:choice>
-        </xs:sequence>
-        <xs:attribute name="id" type="xs:ID"/>
-        <xs:attribute name="default-validation" type="xsl:validation-strip-or-preserve" default="strip"/>
-        <xs:attribute name="input-type-annotations" type="xsl:input-type-annotations-type" default="unspecified"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="value-of" substitutionGroup="xsl:instruction">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="select" type="xsl:expression"/>
-        <xs:attribute name="separator" type="xsl:avt"/>            
-        <xs:attribute name="disable-output-escaping" type="xsl:yes-or-no" default="no"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="variable">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:QName" use="required"/>
-        <xs:attribute name="select" type="xsl:expression" use="optional"/>
-        <xs:attribute name="as" type="xsl:sequence-type" use="optional"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="when">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="test" type="xsl:expression" use="required"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<xs:element name="with-param">
-  <xs:complexType>
-    <xs:complexContent mixed="true">
-      <xs:extension base="xsl:sequence-constructor">
-        <xs:attribute name="name" type="xsl:QName" use="required"/>
-        <xs:attribute name="select" type="xsl:expression"/>
-        <xs:attribute name="as" type="xsl:sequence-type"/>
-        <xs:attribute name="tunnel" type="xsl:yes-or-no"/>   
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:element>
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-<xs:annotation>
-  <xs:documentation>
-    PART C: definition of literal result elements
-    
-    There are three ways to define the literal result elements
-    permissible in a stylesheet.
-    
-    (a) do nothing. This allows any element to be used as a literal
-        result element, provided it is not in the XSLT namespace
-    
-    (b) declare all permitted literal result elements as members
-        of the xsl:literal-result-element substitution group
-        
-    (c) redefine the model group xsl:result-elements to accommodate
-        all permitted literal result elements.
-        
-    Literal result elements are allowed to take certain attributes
-    in the XSLT namespace. These are defined in the attribute group
-    literal-result-element-attributes, which can be included in the
-    definition of any literal result element.
-    
-  </xs:documentation>
-</xs:annotation>   
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-<xs:element name="literal-result-element" abstract="true" type="xs:anyType"/>
-
-<xs:attributeGroup name="literal-result-element-attributes">
-  <xs:attribute name="default-collation" form="qualified" type="xsl:uri-list"/>
-  <xs:attribute name="extension-element-prefixes" form="qualified" type="xsl:prefixes"/>
-  <xs:attribute name="exclude-result-prefixes" form="qualified" type="xsl:prefixes"/>
-  <xs:attribute name="xpath-default-namespace" form="qualified" type="xs:anyURI"/>    
-  <xs:attribute name="inherit-namespaces" form="qualified" type="xsl:yes-or-no" default="yes"/>
-  <xs:attribute name="use-attribute-sets" form="qualified" type="xsl:QNames" default=""/>
-  <xs:attribute name="use-when" form="qualified" type="xsl:expression"/>
-  <xs:attribute name="version" form="qualified" type="xs:decimal"/>
-  <xs:attribute name="type" form="qualified" type="xsl:QName"/>
-  <xs:attribute name="validation" form="qualified" type="xsl:validation-type"/>
-</xs:attributeGroup>
-
-<xs:group name="result-elements">
-  <xs:choice>
-    <xs:element ref="xsl:literal-result-element"/>
-    <xs:any namespace="##other" processContents="skip"/>
-    <xs:any namespace="##local" processContents="skip"/>
-  </xs:choice>
-</xs:group>
-
-
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-<xs:annotation>
-  <xs:documentation>
-    PART D: definitions of simple types used in stylesheet attributes 
-  </xs:documentation>
-</xs:annotation>   
-<!-- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
-
-<xs:simpleType name="avt">
-  <xs:annotation>
-    <xs:documentation>
-      This type is used for all attributes that allow an attribute value template.
-      The general rules for the syntax of attribute value templates, and the specific
-      rules for each such attribute, are described in the XSLT 2.0 Recommendation.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:string"/>
-</xs:simpleType>
-
-<xs:simpleType name="char">
-  <xs:annotation>
-    <xs:documentation>
-      A string containing exactly one character.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:string">
-    <xs:length value="1"/>
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="expression">
-  <xs:annotation>
-    <xs:documentation>
-      An XPath 2.0 expression.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-    <xs:pattern value=".+"/>
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="input-type-annotations-type">
-  <xs:annotation>
-    <xs:documentation>
-      Describes how type annotations in source documents are handled.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-    <xs:enumeration value="preserve"/>
-    <xs:enumeration value="strip"/>   
-    <xs:enumeration value="unspecified"/>        
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="level">
-  <xs:annotation>
-    <xs:documentation>
-      The level attribute of xsl:number: 
-      one of single, multiple, or any.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:NCName">
-    <xs:enumeration value="single"/>
-    <xs:enumeration value="multiple"/>
-    <xs:enumeration value="any"/>
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="mode">
-  <xs:annotation>
-    <xs:documentation>
-      The mode attribute of xsl:apply-templates: 
-      either a QName, or #current, or #default.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:union memberTypes="xsl:QName">
-    <xs:simpleType>
-      <xs:restriction base="xs:token">
-        <xs:enumeration value="#default"/>
-        <xs:enumeration value="#current"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:union>
-</xs:simpleType>
-
-<xs:simpleType name="modes">
-  <xs:annotation>
-    <xs:documentation>
-      The mode attribute of xsl:template: 
-      either a list, each member being either a QName or #default;
-      or the value #all
-    </xs:documentation>
-  </xs:annotation>
-  <xs:union>
-    <xs:simpleType>
-      <xs:list>
-        <xs:simpleType>
-          <xs:union memberTypes="xsl:QName">
-            <xs:simpleType>
-              <xs:restriction base="xs:token">
-                <xs:enumeration value="#default"/>
-              </xs:restriction>
-            </xs:simpleType>
-          </xs:union>
-        </xs:simpleType>
-      </xs:list>
-    </xs:simpleType>
-    <xs:simpleType>
-      <xs:restriction base="xs:token">
-        <xs:enumeration value="#all"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:union>
-</xs:simpleType>
-
-<xs:simpleType name="nametests">
-  <xs:annotation>
-    <xs:documentation>
-      A list of NameTests, as defined in the XPath 2.0 Recommendation.
-      Each NameTest is either a QName, or "*", or "prefix:*", or "*:localname"
-    </xs:documentation>
-  </xs:annotation>
-  <xs:list>
-    <xs:simpleType>
-      <xs:union memberTypes="xsl:QName">
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:enumeration value="*"/>
-          </xs:restriction>
-        </xs:simpleType>
-        <xs:simpleType>
-          <xs:restriction base="xs:token">
-            <xs:pattern value="\i\c*:\*"/>
-            <xs:pattern value="\*:\i\c*"/>            
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:union>
-    </xs:simpleType>
-  </xs:list>
-</xs:simpleType>
-
-<xs:simpleType name="prefixes">
-  <xs:list itemType="xs:NCName"/>
-</xs:simpleType>
-
-<xs:simpleType name="prefix-list-or-all">
-  <xs:union memberTypes="xsl:prefix-list">
-    <xs:simpleType>
-      <xs:restriction base="xs:token">
-        <xs:enumeration value="#all"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:union>
-</xs:simpleType>
-      
-<xs:simpleType name="prefix-list">
-  <xs:list itemType="xsl:prefix-or-default"/>
-</xs:simpleType>
-
-<xs:simpleType name="method">
-  <xs:annotation>
-    <xs:documentation>
-      The method attribute of xsl:output:
-      Either one of the recognized names "xml", "xhtml", "html", "text",
-      or a QName that must include a prefix.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:union>
-    <xs:simpleType>
-      <xs:restriction base="xs:NCName">
-        <xs:enumeration value="xml"/>
-        <xs:enumeration value="xhtml"/>
-        <xs:enumeration value="html"/>
-        <xs:enumeration value="text"/>
-      </xs:restriction>
-    </xs:simpleType>
-    <xs:simpleType>
-      <xs:restriction base="xsl:QName">
-        <xs:pattern value="\c*:\c*"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:union>
-</xs:simpleType>
-
-<xs:simpleType name="pattern">
-  <xs:annotation>
-    <xs:documentation>
-      A match pattern as defined in the XSLT 2.0 Recommendation.
-      The syntax for patterns is a restricted form of the syntax for
-      XPath 2.0 expressions.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xsl:expression"/>
-</xs:simpleType>
-
-<xs:simpleType name="prefix-or-default">
-  <xs:annotation>
-    <xs:documentation>
-      Either a namespace prefix, or #default.
-      Used in the xsl:namespace-alias element.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:union memberTypes="xs:NCName">
-    <xs:simpleType>
-      <xs:restriction base="xs:token">
-        <xs:enumeration value="#default"/>
-      </xs:restriction>
-    </xs:simpleType>
-  </xs:union>
-</xs:simpleType>
-
-<xs:simpleType name="QNames">
-  <xs:annotation>
-    <xs:documentation>
-      A list of QNames.
-      Used in the [xsl:]use-attribute-sets attribute of various elements,
-      and in the cdata-section-elements attribute of xsl:output
-    </xs:documentation>
-  </xs:annotation>
-  <xs:list itemType="xsl:QName"/>          
-</xs:simpleType>
-
-<xs:simpleType name="QName">
-  <xs:annotation>
-    <xs:documentation>
-      A QName.
-      This schema does not use the built-in type xs:QName, but rather defines its own
-      QName type. Although xs:QName would define the correct validation on these attributes,
-      a schema processor would expand unprefixed QNames incorrectly when constructing the PSVI,
-      because (as defined in XML Schema errata) an unprefixed xs:QName is assumed to be in
-      the default namespace, which is not the correct assumption for XSLT.
-      The data type is defined as a restriction of the built-in type Name, restricted
-      so that it can only contain one colon which must not be the first or last character.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:Name">
-    <xs:pattern value="([^:]+:)?[^:]+"/>      
-  </xs:restriction>        
-</xs:simpleType>
-
-<xs:simpleType name="sequence-type">
-  <xs:annotation>
-    <xs:documentation>
-      The description of a data type, conforming to the
-      SequenceType production defined in the XPath 2.0 Recommendation
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-    <xs:pattern value=".+"/>      
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="uri-list">
-  <xs:list itemType="xs:anyURI"/>
-</xs:simpleType>
-
-<xs:simpleType name="validation-strip-or-preserve">
-  <xs:annotation>
-    <xs:documentation>
-      Describes different ways of type-annotating an element or attribute.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xsl:validation-type">
-    <xs:enumeration value="preserve"/>
-    <xs:enumeration value="strip"/>    
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="validation-type">
-  <xs:annotation>
-    <xs:documentation>
-      Describes different ways of type-annotating an element or attribute.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-    <xs:enumeration value="strict"/>
-    <xs:enumeration value="lax"/>
-    <xs:enumeration value="preserve"/>
-    <xs:enumeration value="strip"/>    
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="yes-or-no">
-  <xs:annotation>
-    <xs:documentation>
-      One of the values "yes" or "no".
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-    <xs:enumeration value="yes"/>
-    <xs:enumeration value="no"/>
-  </xs:restriction>
-</xs:simpleType>
-
-<xs:simpleType name="yes-or-no-or-omit">
-  <xs:annotation>
-    <xs:documentation>
-      One of the values "yes" or "no" or "omit".
-    </xs:documentation>
-  </xs:annotation>
-  <xs:restriction base="xs:token">
-    <xs:enumeration value="yes"/>
-    <xs:enumeration value="no"/>
-    <xs:enumeration value="omit"/>
-  </xs:restriction>
-</xs:simpleType>
-
-</xs:schema>
\ No newline at end of file
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 ded342e..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/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 e7a0088..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,25 +0,0 @@
-#Fri May 09 15:32:36 BST 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=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-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=disabled
-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=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index bf7b476..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri May 09 15:32:34 BST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
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 42a1885..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +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: 1.0.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.filesystem;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.jface.text;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="[1.0.0,2.0.0)",
- org.eclipse.wst.xsl.core;bundle-version="[1.0.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.wst.xsl.debug.ui,
- org.eclipse.wst.xsl.internal.debug.ui
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 2199df3..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, 2008</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/operation.gif b/bundles/org.eclipse.wst.xsl.debug.ui/icons/operation.gif
deleted file mode 100644
index b55d9e3..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/icons/operation.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/icons/xslt_launch.gif b/bundles/org.eclipse.wst.xsl.debug.ui/icons/xslt_launch.gif
deleted file mode 100644
index bfe15f8..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/icons/xslt_launch.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/icons/xslt_output.gif b/bundles/org.eclipse.wst.xsl.debug.ui/icons/xslt_output.gif
deleted file mode 100644
index 45fb08d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/icons/xslt_output.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 394942b..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.debug.ui
-Bundle-Name.0 = XSL Debugger UI (Incubating)
-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 5c1ee26..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/plugin.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-	
-	<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/xslt_launch.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"
-        icon="icons/xslt_launch.gif"
-        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.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>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/internal/util/XSLDebugPluginImages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/internal/util/XSLDebugPluginImages.java
deleted file mode 100755
index afc145b..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/internal/util/XSLDebugPluginImages.java
+++ /dev/null
@@ -1,34 +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 223557 - initial API and implementation
- *     Holger Voormann - Icons for Processor, Output, and Launch tabs
- *******************************************************************************/
-package org.eclipse.wst.xsl.debug.internal.util;
-
-/**
- * Bundle of most images used by the XSL Debug Plugins
- */
-public class XSLDebugPluginImages {
-
-	/**
-	 * Path to the XSLT Processor  Images used for launch configurations
-	 */
-	public static final String IMG_PROCESSOR_TAB = "icons/xslt_processor.gif"; //$NON-NLS-1$
-	
-	/**
-	 * Path to the XSLT Output Images used for launch configurations
-	 */
-	public static final String IMG_OUTPUT_TAB = "icons/xslt_output.gif"; //$NON-NLS-1$
-
-	/**
-	 * Path to the XSLT Launch Images used for launch configurations
-	 */
-	public static final String IMG_MAIN_TAB = "icons/xslt_launch.gif"; //$NON-NLS-1$
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/internal/util/XSLPluginImageHelper.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/internal/util/XSLPluginImageHelper.java
deleted file mode 100755
index 86843b5..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/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.debug.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.internal.debug.ui.XSLDebugUIPlugin;
-
-
-/**
- * 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 = XSLDebugUIPlugin.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.debug.ui/src/org/eclipse/wst/xsl/debug/ui/Messages.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/ui/Messages.java
deleted file mode 100644
index 3f42278..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/ui/Messages.java
+++ /dev/null
@@ -1,255 +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.debug.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Messages for the debug.ui package.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class Messages
-{
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.debug.ui.messages"; //$NON-NLS-1$
-
-	/**
-	 * A name for the remove action.
-	 */
-	public static String RemoveAction_Text;
-
-	/**
-	 * A name for the <code>AddWorkspaceFileAction</code> action.
-	 */
-	public static String AddWorkspaceFileAction_Text;
-
-	/**
-	 * A name for the <code>AddExternalFileAction</code> action.
-	 */
-	public static String AddExternalFileAction_Text;
-
-	/**
-	 * A name for the <code>MoveDownAction</code> action.
-	 */
-	public static String MoveDownAction_Text;
-
-	/**
-	 * A name for the <code>MoveUpAction</code> action.
-	 */
-	public static String MoveUpAction_Text;
-
-	/**
-	 * A heading for the <code>AddExternalFileAction</code> dialog.
-	 */
-	public static String AddExternalFileAction_Selection_3;
-
-	/**
-	 * A message for the <code>AddWorkspaceFileAction</code> dialog.
-	 */
-	public static String AddWorkspaceFileAction_DialogMessage;
-
-	/**
-	 * A title for the <code>AddWorkspaceFileAction</code> dialog.
-	 */
-	public static String AddWorkspaceFileAction_DialogTitle;
-
-	/**
-	 * A name for the <code>AddParameterAction</code> action.
-	 */
-	public static String AddParameterAction;
-
-	/**
-	 * A name for the <code>RemoveParameterAction</code> action.
-	 */
-	public static String RemoveParameterAction;
-
-	/**
-	 * A label for the Variables button.
-	 */
-	public static String VariablesFieldButton_Text;
-
-	/**
-	 * A title for the <code>AddParameterAction</code> dialog.
-	 */
-	public static String AddParameterAction_Dialog;
-
-	/**
-	 * A label for the <code>AddParameterAction</code> name text box.
-	 */
-	public static String AddParameterAction_Dialog_Name;
-
-	/**
-	 * A label for the <code>AddParameterAction</code> type combo.
-	 */
-	public static String AddParameterAction_Dialog_Type;
-
-	/**
-	 * A label for the <code>AddParameterAction</code> value text box.
-	 */
-	public static String AddParameterAction_Dialog_Value;
-	
-	public static String XSLBreakpointProvider_0;
-	
-	public static String StylesheetEntryLabelProvider_Invalid_path;
-
-	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 TransformsBlock_ParametersLabel;
-
-	public static String TransformsBlock_StylesheetsLabel;
-	
-	public static String ParametersBlock_0;
-	public static String ParametersBlock_1;
-	public static String ParametersBlock_10;
-	public static String ParametersBlock_11;
-	public static String ParametersBlock_2;
-	public static String ParametersBlock_3;
-	public static String ParametersBlock_4;
-	public static String ParametersBlock_5;
-	public static String ParametersBlock_6;
-	public static String ParametersBlock_7;
-	public static String ParametersBlock_8;
-	public static String ParametersBlock_9;
-	
-	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;
-	
-	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;	
-	
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages()
-	{
-	}
-
-	/**
-	 * Get the message for the given key.
-	 * 
-	 * @param key the message key
-	 * @return the message
-	 */
-	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/debug/ui/messages.properties b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/ui/messages.properties
deleted file mode 100644
index 528f406..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/debug/ui/messages.properties
+++ /dev/null
@@ -1,61 +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
-#Action Messages
-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=
-AddParameterAction=Add Parameter
-RemoveParameterAction=Remove Parameter
-VariablesFieldButton_Text=Variables...
-AddParameterAction_Dialog=Add XSLT Parameter
-AddParameterAction_Dialog_Name=Name:
-AddParameterAction_Dialog_Type=Type:
-AddParameterAction_Dialog_Value=Value:
-#Breakpoint
-XSLBreakpointProvider_0=unsupported input type
-
-StylesheetEntryLabelProvider_Invalid_path=Invalid path
-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_WORKSPACE_DIALOG_TITLE=File Selection
-
-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=
-AddParameterAction=Add Parameter
-RemoveParameterAction=Remove Parameter
-VariablesFieldButton_Text=Variables...
-AddParameterAction_Dialog=Add XSLT Parameter
-AddParameterAction_Dialog_Name=Name:
-AddParameterAction_Dialog_Type=Type:
-AddParameterAction_Dialog_Value=Value:
\ No newline at end of file
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 53bc5c1..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/AbstractTableBlock.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;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.swt.widgets.Table;
-
-/**
- * An <code>AbstractLaunchConfigurationTab</code> specialised for blocks that
- * contain a table. This abstract class conveniently saves and restores the table's
- * column settings.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-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.
-	 */
-	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/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 e4d3acb..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/ResourceSelectionBlock.java
+++ /dev/null
@@ -1,573 +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.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;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-
-/**
- * A block that shows a text box with buttons for browsing workspace or the filesystem
- * in order to populate the text box with a file path.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-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 defaultResource;
-	protected String resource;
-	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 IContainer))
-					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());
-			}
-		}
-	}
-
-	/**
-	 * Same as <code>new ResourceSelectionBlock(true)</code>
-	 */
-	public ResourceSelectionBlock()
-	{
-		this(true);
-	}
-
-	/**
-	 * Same as <code>new ResourceSelectionBlock(IResource.FOLDER,showDefault)</code>
-	 * 
-	 * @param showDefault true if this should have a 'Show Default' button
-	 */
-	public ResourceSelectionBlock(boolean showDefault)
-	{
-		this(IResource.FOLDER, showDefault);
-	}
-
-	/**
-	 * Same as <code>new ResourceSelectionBlock(resourceType,showDefault,true)</code>
-	 * 
-	 * @param resourceType the type of resource to select - IResource.FOLDER or IResource.FILE
-	 * @param showDefault true if this should have a 'Show Default' button
-	 */
-	public ResourceSelectionBlock(int resourceType, boolean showDefault)
-	{
-		this(resourceType, showDefault, true);
-	}
-
-	/**
-	 * Same as <code>new ResourceSelectionBlock(resourceType,showDefault,required,true)</code>
-	 * 
-	 * @param resourceType the type of resource to select - IResource.FOLDER or IResource.FILE
-	 * @param showDefault true if this should have a 'Show Default' button
-	 * @param required true if a blank text box is invalid
-	 */
-	public ResourceSelectionBlock(int resourceType, boolean showDefault, boolean required)
-	{
-		this(resourceType, showDefault, required, true);
-	}
-
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param resourceType the type of resource to select - IResource.FOLDER or IResource.FILE
-	 * @param showDefault true if this should have a 'Show Default' button
-	 * @param required true if a blank text box is invalid
-	 * @param mustExist true of the selected resource must already exist
-	 */
-	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(defaultResource == null ? "" : defaultResource); //$NON-NLS-1$
-		}
-		else
-		{
-			resourceText.setText(resource == null ? "" : resource); //$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/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 c983bae..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLDebugUIConstants.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.internal.debug.ui;
-
-/**
- * Constants for the XSL Debug UI.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class XSLDebugUIConstants
-{
-	private static final String PREFIX = XSLDebugUIPlugin.PLUGIN_ID + '.';
-	/**
-	 * Constant used to store column setting preferences for the <code>InstalledProcessorsBlock</code>
-	 */
-	public static final String PROCESSOR_DETAILS_DIALOG = PREFIX + "PROCESSOR_DETAILS_DIALOG"; //$NON-NLS-1$
-	/**
-	 * Constant used to store column setting preferences for the <code>ParametersBlock</code>
-	 */
-	public static final String MAIN_PARAMATERS_BLOCK = PREFIX + "MAIN_PARAMATERS_BLOCK"; //$NON-NLS-1$
-	/**
-	 * Constant used to store column setting preferences for the <code>TransformsBlock</code>
-	 */
-	public static final String MAIN_TRANSFORMS_BLOCK = PREFIX + "MAIN_TRANSFORMS_BLOCK"; //$NON-NLS-1$
-	/**
-	 * Constant used to store column setting preferences for the <code>OutputBlock</code>
-	 */
-	public static final String OUTPUT_BLOCK = PREFIX + "OUTPUT_BLOCK"; //$NON-NLS-1$
-	/**
-	 * The id of the XSL editor
-	 */
-	public static final String XSL_EDITOR_ID = "org.eclipse.wst.xsl.ui.XSLEditor"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLDebugUILaunchListener.java b/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLDebugUILaunchListener.java
deleted file mode 100644
index 04d5a59..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLDebugUILaunchListener.java
+++ /dev/null
@@ -1,152 +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.internal.debug.ui;
-
-import java.io.File;
-
-import org.eclipse.core.commands.common.CommandException;
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchesListener2;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.handlers.IHandlerService;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.xsl.launching.config.BaseLaunchHelper;
-
-/**
- * A listener to XSL launches. When an XSL launch is terminated, this performs the UI parts of the 
- * XSL launching - such as open the editor on the output file, and format it.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class XSLDebugUILaunchListener implements ILaunchesListener2
-{
-	/**
-	 * Starts the launch listening
-	 */
-	public void start()
-	{
-		DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this);
-	}
-	
-	/**
-	 * Stops the launch listening
-	 */
-	public void stop()
-	{
-		DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this);
-	}
-	
-	public void launchesTerminated(ILaunch[] launches)
-	{
-		for (ILaunch launch : launches)
-		{
-			ILaunchConfigurationType configType = null;
-			try
-			{
-				configType = launch.getLaunchConfiguration().getType();
-			}
-			catch (CoreException e)
-			{
-				// do nothing
-			}
-			if (configType != null && "org.eclipse.wst.xsl.launching.launchConfigurationType".equals(configType.getIdentifier()))
-			{
-				try
-				{
-					BaseLaunchHelper launchHelper = new BaseLaunchHelper(launch.getLaunchConfiguration());
-					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());
-						}
-						catch (CoreException e)
-						{
-							XSLDebugUIPlugin.log(e);
-						}
-					}
-					openFileIfRequired(launchHelper);
-				}
-				catch (CoreException e)
-				{
-					XSLDebugUIPlugin.log(e);
-				}
-			}
-		}
-	}
-
-	public void launchesAdded(ILaunch[] launches)
-	{
-		// do nothing
-	}
-
-	public void launchesChanged(ILaunch[] launches)
-	{
-		// do nothing
-	}
-
-	public void launchesRemoved(ILaunch[] launches)
-	{
-		// do nothing
-	}
-	
-	private void openFileIfRequired(final BaseLaunchHelper launchHelper)
-	{
-		if (launchHelper.getOpenFileOnCompletion())
-		{
-			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable()
-			{
-				public void run()
-				{
-					try
-					{
-						// Open editor on new file.
-						IWorkbenchWindow dw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-						File file = launchHelper.getTarget();
-						Path path = new Path(file.getAbsolutePath());
-						IFileStore filestore = EFS.getLocalFileSystem().getStore(path);
-						IDE.openEditorOnFileStore(dw.getActivePage(), filestore);
-						
-						if (launchHelper.getFormatFileOnCompletion())
-						{
-							// format the editor contents
-							IHandlerService p = (IHandlerService)PlatformUI.getWorkbench().getService(IHandlerService.class);
-							p.executeCommand("org.eclipse.wst.sse.ui.format.document", null);
-						}
-					}
-					catch (PartInitException e)
-					{
-						XSLDebugUIPlugin.log(e);
-					}
-					catch (CommandException e)
-					{
-						XSLDebugUIPlugin.log(e);
-					}
-				}
-			});
-		}
-	}
-}
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 5cf1503..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLDebugUIPlugin.java
+++ /dev/null
@@ -1,192 +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.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 XSL Debug UI plugin.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class XSLDebugUIPlugin extends AbstractUIPlugin
-{
-	/**
-	 * The id of this.
-	 */
-	public static final String PLUGIN_ID = "org.eclipse.wst.xsl.debug.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static XSLDebugUIPlugin plugin;
-	
-	private XSLDebugUILaunchListener launchListener = new XSLDebugUILaunchListener();
-
-	/**
-	 * Create a new instance of this.
-	 */
-	public XSLDebugUIPlugin()
-	{
-		plugin = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception
-	{
-		super.start(context);
-		launchListener.start();
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception
-	{
-		plugin = null;
-		launchListener.stop();
-		super.stop(context);
-	}
-
-	/**
-	 * Get the singleton instance of this.
-	 * 
-	 * @return the singleton
-	 */
-	public static XSLDebugUIPlugin getDefault()
-	{
-		return plugin;
-	}
-
-	/**
-	 * Get an ImageDescriptor from a path in this bundle.
-	 * 
-	 * @param path the path to the image
-	 * @return the ImageDescriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path)
-	{
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-	/**
-	 * Convenience method for opening a given preference page.
-	 * 
-	 * @param id the id of the preference page
-	 * @param page the preference page to show
-	 */
-	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);
-			}
-		});
-	}
-
-	/**
-	 * Get the current Display if possible, or else the default Display.
-	 * 
-	 * @return the current or default Display
-	 */
-	public static Display getStandardDisplay()
-	{
-		Display display;
-		display = Display.getCurrent();
-		if (display == null)
-			display = Display.getDefault();
-		return display;
-	}
-
-	/**
-	 * Get the active workbench window from the workbench.
-	 * 
-	 * @return the active workbench window
-	 */
-	public static IWorkbenchWindow getActiveWorkbenchWindow()
-	{
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	/**
-	 * Get the shell of the active workbench window.
-	 * 
-	 * @return the active workbench shell
-	 */
-	public static Shell getActiveWorkbenchShell()
-	{
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		if (window != null)
-		{
-			return window.getShell();
-		}
-		return null;
-	}
-
-	/**
-	 * Get the active page of the active workbench window.
-	 * 
-	 * @return the active page
-	 */
-	public static IWorkbenchPage getActivePage()
-	{
-		IWorkbenchWindow w = getActiveWorkbenchWindow();
-		if (w != null)
-		{
-			return w.getActivePage();
-		}
-		return null;
-	}
-
-	/**
-	 * Log the given exception by creating a new Status.
-	 * 
-	 * @param e the exception to log
-	 */
-	public static void log(Exception e)
-	{
-		getDefault().getLog().log(new Status(IStatus.ERROR, PLUGIN_ID, 0, "", e)); //$NON-NLS-1$
-	}
-
-	/**
-	 * Log the given core exception.
-	 * 
-	 * @param e the exception to log
-	 */
-	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 beeabcf..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchConfigurationTab.java
+++ /dev/null
@@ -1,141 +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;
-
-/**
- * The base class for XSL launch configuration tabs which allows a number of 'blocks' to be added.
- * Each block must itself fully implement <code>ILaunchConfigurationTab</code>.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-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
-//	protected boolean isDirty()
-//	{
-//		for (ILaunchConfigurationTab element : blocks)
-//			if (((XSLLaunchConfigurationTab)element).isDirty())
-//				return true;
-//		return super.isDirty();
-//	}
-
-	@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 8faa2ea..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLLaunchShortcut.java
+++ /dev/null
@@ -1,333 +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.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.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.core.XSLCore;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.InputFileBlock;
-import org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.config.BaseLaunchHelper;
-import org.eclipse.wst.xsl.launching.config.LaunchPipeline;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-/**
- * <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
- * @since 1.0
- */
-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 (XSLCore.isXMLFile(file))
-				{
-					if (XSLCore.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);
-			try
-			{
-				inputFile = VariablesPlugin.getDefault().getStringVariableManager().performStringSubstitution(inputFile);
-			}
-			catch (CoreException e)
-			{
-				// just ignore this one
-				continue;
-			}
-			Path path = new Path(inputFile);
-			// the source xml file must be the same
-			if (path.equals(xmlFilePath))
-			{
-				BaseLaunchHelper lh = new BaseLaunchHelper(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_DEFAULT_OUTPUT_FILE, true);
-			wc.setAttribute(XSLLaunchConfigurationConstants.ATTR_OPEN_FILE, 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 42ba093..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/XSLTTabGroup.java
+++ /dev/null
@@ -1,59 +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.wst.xsl.internal.debug.ui.tabs.main.XSLMainTab;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.output.OutputTab;
-
-/**
- *The tab group for the XSL tabs.
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class XSLTTabGroup extends AbstractLaunchConfigurationTabGroup
-{
-	/**
-	 * Create a new instance of this.
-	 */
-	public XSLTTabGroup()
-	{
-	}
-
-	public void createTabs(ILaunchConfigurationDialog dialog, String mode)
-	{
-		XSLMainTab main = new XSLMainTab();
-		ILaunchConfigurationTab[] tabs = new ILaunchConfigurationTab[] { main, new OutputTab(main) };
-		tabs = addTabs(tabs, new ILaunchConfigurationTab[] { new SourceLookupTab(), new CommonTab() });
-
-		setTabs(tabs);
-	}
-
-	private ILaunchConfigurationTab[] addTabs(ILaunchConfigurationTab[] tabs1, ILaunchConfigurationTab[] tabs2)
-	{
-		ILaunchConfigurationTab[] newTabs = new ILaunchConfigurationTab[tabs1.length + tabs2.length];
-		System.arraycopy(tabs1, 0, newTabs, 0, tabs1.length);
-		System.arraycopy(tabs2, 0, newTabs, tabs1.length, tabs2.length);
-		return newTabs;
-	}
-
-	@Override
-	public void setTabs(ILaunchConfigurationTab[] tabs)
-	{
-		// TODO Auto-generated method stub
-		super.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 d19b75b..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractParameterAction.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.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;
-
-/**
- * A convenient base class for add/remove parameter actions.
- * 
- * @author Doug Satchwell
- */
-public abstract class AbstractParameterAction extends SelectionListenerAction
-{
-	private ParameterViewer viewer;
-	private Button button;
-	private Shell shell;
-
-	protected AbstractParameterAction(String text, ParameterViewer viewer)
-	{
-		super(text);
-		setViewer(viewer);
-	}
-
-	/**
-	 * Set the viewer.
-	 * 
-	 * @param viewer the parametere 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;
-	}
-
-	/**
-	 * Set the button associated with the action.
-	 * 
-	 * @param button the button
-	 */
-	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;
-	}
-
-	/**
-	 * Set the shell that will be used for opening a dialog.
-	 * 
-	 * @param shell the shell to use
-	 */
-	public void setShell(Shell shell)
-	{
-		this.shell = shell;
-	}
-
-	@Override
-	protected boolean updateSelection(IStructuredSelection selection)
-	{
-		return getViewer().updateSelection(getActionType(), selection);
-	}
-
-	protected int getActionType()
-	{
-		return AbstractStylesheetAction.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 d636b42..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AbstractStylesheetAction.java
+++ /dev/null
@@ -1,201 +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;
-
-/**
- * A convenient base class for actions associated with the stylesheet viewer.
- * 
- * @author Doug Satchwell
- */
-public abstract class AbstractStylesheetAction extends SelectionListenerAction
-{
-	/**
-	 * The default action type.
-	 */
-	public static final int DEFAULT = 0;
-	/**
-	 * The action type for add actions.
-	 */
-	public static final int ADD = 1;
-	/**
-	 * The action type for remove actions.
-	 */
-	public static final int REMOVE = 2;
-	/**
-	 * The action type for move actions.
-	 */
-	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);
-	}
-
-	/**
-	 * Add an array of LaunchTransform's to the viewer.
-	 * 
-	 * @param res launch transforms to add
-	 */
-	public void addTransforms(LaunchTransform[] res)
-	{
-		viewer.addTransforms(res);
-	}
-
-	/**
-	 * Set the viewer associated with this action.
-	 * 
-	 * @param viewer the viewer
-	 */
-	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;
-	}
-
-	/**
-	 * Set the button associated with this action.
-	 * 
-	 * @param button the button
-	 */
-	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;
-	}
-
-	/**
-	 * Set the shell to be used for opening a dialog.
-	 * 
-	 * @param shell the shell to use
-	 */
-	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/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 d9f1b05..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddExternalFileAction.java
+++ /dev/null
@@ -1,75 +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 245772 - NLS Message refactoring
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-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;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-
-/**
- * An action that opens a dialog to allow the user to select a file from the file system.
- * 
- * @author Doug Satchwell
- */
-public class AddExternalFileAction extends OpenDialogAction
-{
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param viewer the stylesheet viewer
-	 * @param dialogSettingsPrefix a prefix to use for saving dialog preferences
-	 */
-	public AddExternalFileAction(StylesheetViewer viewer, String dialogSettingsPrefix)
-	{
-		super(Messages.getString("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(Messages.getString("AddExternalFileAction_Selection_3"));
-		dialog.setFilterPath(lastUsedPath);
-		IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
-		IContentType contentType = contentTypeManager.getContentType("org.eclipse.wst.xml.core.xslsource"); //$NON-NLS-1$
-		String[] xslContentTypes = contentType.getFileSpecs(IContentType.FILE_EXTENSION_SPEC);
-
-		dialog.setFilterExtensions(xslContentTypes);
-		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 51d3e76..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddParameterAction.java
+++ /dev/null
@@ -1,65 +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 245772 - NLS Message refactoring
- *******************************************************************************/
-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;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-/**
- * An action that opens a dialog to allow the user to add a parameter to a transform.
- * 
- * @author Doug Satchwell
- */
-public class AddParameterAction extends AbstractParameterAction
-{
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param viewer teh viewer
-	 */
-	public AddParameterAction(ParameterViewer viewer)
-	{
-		super(Messages.getString("AddParameterAction"), viewer);
-	}
-
-	@Override
-	public void run()
-	{
-		MultipleInputDialog dialog = new MultipleInputDialog(getShell(), Messages.getString("AddParameterAction_Dialog"));
-		String namelabel = Messages.getString("AddParameterAction_Dialog_Name");
-		dialog.addTextField(namelabel, null, false);
-		String variableslabel = Messages.getString("AddParameterAction_Dialog_Value");
-		dialog.addVariablesField(variableslabel, null, false);
-		dialog.open();
-
-		if (dialog.getReturnCode() == Window.OK)
-		{
-			String name = dialog.getStringValue(namelabel);
-			String value = dialog.getStringValue(variableslabel);
-			LaunchAttribute parameter = null;
-			if (value != null && value.indexOf("${") > -1) //$NON-NLS-1$
-				parameter = new LaunchAttribute(name, null, value);
-			else
-				parameter = new LaunchAttribute(name, null, 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 796b19a..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/AddWorkspaceFileAction.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
- *     David Carver - bug 245772 - NLS Message refactoring
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.debug.ui.actions;
-
-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.ResourceComparator;
-import org.eclipse.wst.xsl.core.XSLCore;
-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;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-/**
- * An action that opens a dialog to allow the user to select a file in the workspace.
- * 
- * @author Doug Satchwell
- */
-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$
-		}
-	};
-
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param viewer the viewer
-	 */
-	public AddWorkspaceFileAction(StylesheetViewer viewer)
-	{
-		super(Messages.getString("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(Messages.getString("AddWorkspaceFileAction_DialogTitle"));
-		dialog.setMessage(Messages.getString("AddWorkspaceFileAction_DialogMessage"));
-		dialog.addFilter(new ViewerFilter()
-		{
-			@Override
-			public boolean select(Viewer viewer, Object parentElement, Object element)
-			{
-				if (!(element instanceof IResource))
-					return false;
-				IResource resource = (IResource)element;
-				if (resource.getType() == IResource.FILE)
-				{
-					if (!XSLCore.isXSLFile((IFile)resource))
-						return false;
-				}
-				return true;
-			}
-		});
-		dialog.setInput(ResourcesPlugin.getWorkspace().getRoot());
-		dialog.setComparator(new ResourceComparator(ResourceComparator.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 71caaf6..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/ControlAccessibleListener.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.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.widgets.Control;
-
-/**
- * Used to help with accessibility.
- * 
- * @author Doug Satchwell
- */
-public class ControlAccessibleListener extends AccessibleAdapter
-{
-	private final String controlName;
-
-	private ControlAccessibleListener(String name)
-	{
-		controlName = name;
-	}
-
-	@Override
-	public void getName(AccessibleEvent e)
-	{
-		e.result = controlName;
-	}
-
-	/**
-	 * Helper for adding an instance of this to the given control.
-	 * 
-	 * @param comp the control to add this to
-	 * @param name the name for this
-	 */
-	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 fe7dda7..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveDownAction.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.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;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-/**
- * The action for moving a stylesheet further down in the transformation pipeline.
- * 
- * @author Doug Satchwell
- */
-public class MoveDownAction extends AbstractStylesheetAction
-{
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param viewer
-	 */
-	public MoveDownAction(StylesheetViewer viewer)
-	{
-		super(Messages.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 0dffbc8..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MoveUpAction.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
- *     David Carver (STAR) - bug 245772 - NLS Message refactoring
- *******************************************************************************/
-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;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-/**
- * The action for moving a stylesheet further up in the transformation pipeline.
- * 
- * @author Doug Satchwell
- */
-public class MoveUpAction extends AbstractStylesheetAction
-{
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param viewer
-	 */
-	public MoveUpAction(StylesheetViewer viewer)
-	{
-		super(Messages.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 2121176..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/MultipleInputDialog.java
+++ /dev/null
@@ -1,435 +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 245772 - NLS Message refactor
- *******************************************************************************/
-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;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-/**
- * A dialog with handy methods for adding simple controls to itself.
- * 
- * @author Doug Satchwell
- */
-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>();
-	@SuppressWarnings("unchecked")
-	protected Map<Object, Comparable> valueMap = new HashMap<Object, Comparable>();
-
-	private final String title;
-
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param shell the shell to open the dialog on
-	 * @param title the title for the dialog
-	 */
-	public MultipleInputDialog(final Shell shell, final 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;
-	}
-
-	/**
-	 * Add a label, text box and button for browsing the for a file.
-	 * 
-	 * @param labelText the label
-	 * @param initialValue the initial value
-	 * @param allowsEmpty true if the text box can be empty
-	 */
-	public void addBrowseField(String labelText, String initialValue, boolean allowsEmpty)
-	{
-		fieldList.add(new FieldSummary(BROWSE, labelText, initialValue, allowsEmpty));
-	}
-
-	/**
-	 * Add a label and a text box.
-	 * 
-	 * @param labelText the label
-	 * @param initialValue the initial value
-	 * @param allowsEmpty true if the text box can be empty
-	 */
-	public void addTextField(String labelText, String initialValue, boolean allowsEmpty)
-	{
-		fieldList.add(new FieldSummary(TEXT, labelText, initialValue, allowsEmpty));
-	}
-
-	/**
-	 * Add a label, a text box and a button for selecting variables.
-	 * 
-	 * @param labelText the label
-	 * @param initialValue the initial value
-	 * @param allowsEmpty true if the text box can be empty
-	 */
-	public void addVariablesField(String labelText, String initialValue, boolean allowsEmpty)
-	{
-		fieldList.add(new FieldSummary(VARIABLE, labelText, initialValue, allowsEmpty));
-	}
-
-	/**
-	 * Add a label and a combo.
-	 * 
-	 * @param labelText the label
-	 * @param initialIndex the initial selection index
-	 * @param items the array of items for the combo
-	 */
-	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);
-	}
-
-	protected 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, Messages.getString("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);
-
-	}
-
-	protected 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();
-	}
-
-	protected Object getValue(String key)
-	{
-		return valueMap.get(key);
-	}
-
-	protected String getStringValue(String key)
-	{
-		return (String) getValue(key);
-	}
-
-	protected int getIntValue(String key)
-	{
-		return ((Integer) getValue(key)).intValue();
-	}
-
-	protected 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 3c269b0..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/OpenDialogAction.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.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;
-
-/**
- * An action that opens a dialog.
- * 
- * @author Doug Satchwell
- */
-public class OpenDialogAction extends AbstractStylesheetAction
-{
-	protected static final String LAST_PATH_SETTING = "LAST_PATH_SETTING"; //$NON-NLS-1$
-	private String fPrefix = null;
-
-	/**
-	 * Create a new instance of this
-	 * 
-	 * @param label the dialog title
-	 * @param viewer a viewer that this dialog is associated with
-	 * @param dialogSettingsPrefix the prefix to use for saving dialog preferences
-	 */
-	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 7fcc8cf..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveAction.java
+++ /dev/null
@@ -1,59 +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 245772 - NLS Message refactoring
- *******************************************************************************/
-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;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-/**
- * An action that removes a selection from a viewer.
- * 
- * @author Doug Satchwell
- */
-public class RemoveAction extends AbstractStylesheetAction
-{
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param viewer the viewer that will have its selection removed
-	 */
-	public RemoveAction(StylesheetViewer viewer)
-	{
-		super(Messages.getString("RemoveAction_Text"), viewer);
-	}
-
-	@SuppressWarnings("unchecked")
-	@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 a45609b..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/actions/RemoveParameterAction.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
- *     David Carver (STAR) - bug 245772 - NLS Message refactoring
- *******************************************************************************/
-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;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-/**
- * An action that removes a selection from a viewer.
- * 
- * @author Doug Satchwell
- */
-public class RemoveParameterAction extends AbstractParameterAction
-{
-	/**
-	 * Create a new instance of this.
-	 * 
-	 * @param viewer the viewer that will have its selection removed
-	 */
-	public RemoveParameterAction(ParameterViewer viewer)
-	{
-		super(Messages.getString("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/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 3f9c4fa..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/breakpoint/XSLBreakpointProvider.java
+++ /dev/null
@@ -1,160 +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 245772 - NLS Message refactoring
- *******************************************************************************/
-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;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-/**
- * An SSE <code>IBreakpointProvider</code> for XSL files.
- * 
- * @author Doug Satchwell
- */
-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/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 6fbfafe..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLBreakpointAdapterFactory.java
+++ /dev/null
@@ -1,49 +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.core.resources.IResource;
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.xsl.core.XSLCore;
-
-/**
- * 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 && resource instanceof IFile)
-			{
-				if (XSLCore.isXSLFile((IFile)resource))
-				{
-					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 870045d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLLineBreakpointAdapter.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.debug.ui.model;
-
-import org.eclipse.core.resources.IFile;
-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.core.XSLCore;
-import org.eclipse.wst.xsl.launching.model.IXSLConstants;
-import org.eclipse.wst.xsl.launching.model.XSLLineBreakpoint;
-
-/**
- * An <code>IToggleBreakpointsTarget</code> for XSL breakpoints.
- * 
- * @author Doug Satchwell
- */
-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 && resource.getType() == IResource.FILE)
-			{
-				if (XSLCore.isXSLFile((IFile)resource))
-				{
-					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 50ded41..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/model/XSLModelPresentation.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.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;
-
-/**
- * An <code>IDebugModelPresentation</code> for XSL debugging. 
- * 
- * @author Doug Satchwell
- */
-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/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 ae0e15b..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.core.runtime.xml"); //$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 423e311..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/MainTabMessages.java
+++ /dev/null
@@ -1,63 +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 StylesheetEntryLabelProvider_Invalid_path;
-
-	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 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 2c711b9..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/MainTabMessages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-StylesheetEntryLabelProvider_Invalid_path=Invalid path
-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_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 3f9e747..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- *Copyright (c) 2008 Standards for Technology in Automotive Retail Corporation and others.
- *All rights reserved. This program and the accompanying materials
- *are made available under the terms 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 Caver (STAR) - initial API and implementation
- *******************************************************************************/
-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 987ce7e..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersBlock.java
+++ /dev/null
@@ -1,243 +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.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.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.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.RemoveAction;
-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$
-
-		TableColumn column3 = new TableColumn(fTable, SWT.NONE);
-		column3.setWidth(250);
-		column3.setResizable(true);
-		column3.setText(Messages.getString("ParametersBlock.2")); //$NON-NLS-1$
-
-		parametersViewer = new ParameterViewer(fTable);
-		parametersViewer.setLabelProvider(new ParametersLabelProvider());
-		parametersViewer.setContentProvider(new ParametersContentProvider());
-		parametersViewer.addParametersChangedListener(new IParametersChangedListener()
-		{
-
-			public void parametersChanged(ParameterViewer viewer)
-			{
-				updateLaunchConfigurationDialog();
-			}
-		});
-		parametersViewer.getTable().addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent event) {
-				if (event.character == SWT.DEL && event.stateMask == 0) {
-					RemoveParameterAction ra = new RemoveParameterAction(parametersViewer);
-					ra.run();
-					updateLaunchConfigurationDialog();
-				}
-			}
-		});
-
-		parametersViewer.setColumnProperties(new String[]
-		{ "name", "value" }); //$NON-NLS-1$ //$NON-NLS-2$
-		TextCellEditor textEditor = new TextCellEditor(fTable);
-		CellEditor[] editors = new CellEditor[]
-		{ null, textEditor };
-		parametersViewer.setCellEditors(editors);
-		parametersViewer.setCellModifier(new ICellModifier()
-		{
-			public boolean canModify(Object element, String property)
-			{
-				return "value".equals(property); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			public Object getValue(Object element, String property)
-			{
-				LaunchAttribute att = (LaunchAttribute) element;
-				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();
-				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 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 e5da79f..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/ParametersLabelProvider.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.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.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 d897e27..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/StylesheetLabelProvider.java
+++ /dev/null
@@ -1,85 +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.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-public class StylesheetLabelProvider extends LabelProvider
-{
-	private Image image = XSLDebugUIPlugin.getImageDescriptor("icons/xslt_launch.gif").createImage();
-	
-	@Override
-	public Image getImage(Object element)
-	{
-		return image;
-	}
-
-	@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(Messages.StylesheetEntryLabelProvider_Invalid_path, new Object[]
-			{ "null" }); //$NON-NLS-1$
-		}
-
-		if (path == null)
-		{
-			return MessageFormat.format(Messages.StylesheetEntryLabelProvider_Invalid_path, new Object[]
-			{ "null" }); //$NON-NLS-1$
-		}
-		else if (!path.isAbsolute() || !path.isValidPath(path.toString()))
-		{
-			return MessageFormat.format(Messages.StylesheetEntryLabelProvider_Invalid_path, new Object[]
-			{ 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 81a748d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/TransformsBlock.java
+++ /dev/null
@@ -1,207 +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.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-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;
-import org.eclipse.wst.xsl.debug.ui.Messages;
-
-public class TransformsBlock extends AbstractTableBlock implements IStylesheetEntriesChangedListener
-{
-	protected static final String DIALOG_SETTINGS_PREFIX = "TransformsBlock"; 
-	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());
-		stylesheetViewer.getTable().addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent event) {
-				if (event.character == SWT.DEL && event.stateMask == 0) {
-					RemoveAction ra = new RemoveAction(stylesheetViewer);
-					ra.run();
-					updateLaunchConfigurationDialog();
-				}
-			}
-		});
-
-		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));
-		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 Messages.getString("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 92a773f..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/main/XSLMainTab.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007,2008 Chase Technology Ltd - http://www.chasetechnology.co.uk and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms 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 223557 - Added Images contributed by Holger Voorman
- *******************************************************************************/
-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.graphics.Image;
-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.core.XSLCore;
-import org.eclipse.wst.xsl.debug.internal.util.XSLDebugPluginImages;
-import org.eclipse.wst.xsl.debug.internal.util.XSLPluginImageHelper;
-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 && XSLCore.isXSLFile((IFile)resource)) 
-				stylesheets.add(resource);
-		}
-		return (IFile[]) stylesheets.toArray(new IFile[0]);
-
-	}
-	
-	@Override
-	public Image getImage() {
-		return XSLPluginImageHelper.getInstance().getImage(XSLDebugPluginImages.IMG_MAIN_TAB);
-	}
-}
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 4afa178..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/Messages.java
+++ /dev/null
@@ -1,91 +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;
-	
-	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;
-	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 73c9d5c..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/OutputFileBlock.java
+++ /dev/null
@@ -1,299 +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.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.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.Label;
-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.launching.XSLLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.launching.XSLTRuntime;
-
-public class OutputFileBlock extends ResourceSelectionBlock
-{
-	private Button openFileCheckButton;
-	private Button formatFileCheckButton;
-	private String inputFilename;
-	private Text fileNameText;
-	private String defaultOutputFileName;
-	private String outputFileName;
-
-	public OutputFileBlock()
-	{
-		super(IResource.FOLDER, true, true, false);
-	}
-
-	@Override
-	protected String getMessage(int type)
-	{
-		switch (type)
-		{
-			case ERROR_DIRECTORY_NOT_SPECIFIED:
-				return Messages.OutputFOFileBlock_DIRECTORY_NOT_SPECIFIED;
-			case ERROR_DIRECTORY_DOES_NOT_EXIST:
-				return Messages.OutputFOFileBlock_DIRECTORY_DOES_NOT_EXIST;
-			case GROUP_NAME:
-				return getName();
-			case USE_DEFAULT_RADIO:
-				return Messages.OutputFileBlock_0;
-			case USE_OTHER_RADIO:
-				return Messages.OutputFOFileBlock_OTHER_RADIO;
-			case DIRECTORY_DIALOG_MESSAGE:
-				return Messages.OutputFOFileBlock_DIALOG_MESSAGE;
-			case WORKSPACE_DIALOG_MESSAGE:
-				return Messages.OutputFOFileBlock_WORKSPACE_DIALOG_MESSAGE;
-			case VARIABLES_BUTTON:
-				return Messages.OutputFOFileBlock_VARIABLES_BUTTON;
-			case FILE_SYSTEM_BUTTON:
-				return Messages.OutputFOFileBlock_FILE_SYSTEM_BUTTON;
-			case WORKSPACE_BUTTON:
-				return Messages.OutputFOFileBlock_WORKSPACE_BUTTON;
-			case WORKSPACE_DIALOG_TITLE:
-				return Messages.OutputFOFileBlock_WORKSPACE_DIALOG_TITLE;
-		}
-		return "" + type; //$NON-NLS-1$
-	}
-
-	@Override
-	protected void setDefaultResource()
-	{}
-	
-	@Override
-	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);
-
-		Label label = new Label(specificFileComp, SWT.NONE);
-		label.setText("Filename");
-
-		fileNameText = new Text(specificFileComp, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = showDefault ? 1 : 2;
-		fileNameText.setLayoutData(gd);
-		fileNameText.setFont(parent.getFont());
-		fileNameText.addModifyListener(widgetListener);
-
-		if (showDefault)
-		{
-			label = new Label(specificFileComp, SWT.NONE);
-			label.setText(Messages.OutputFileBlock_7);
-		}
-
-		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);
-	}
-
-	@Override
-	protected void createButtons(Composite parent)
-	{
-		Composite checkComposite = new Composite(parent,SWT.NONE);
-		checkComposite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-		GridLayout gl = new GridLayout();
-		gl.marginWidth = 0;
-		checkComposite.setLayout(gl);
-		
-		openFileCheckButton = createCheckButton(checkComposite, Messages.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)
-			{
-				if (openFileCheckButton.getSelection())
-				{
-					formatFileCheckButton.setEnabled(true);
-					updateLaunchConfigurationDialog();
-				}
-				else
-				{
-					formatFileCheckButton.setEnabled(false);
-					formatFileCheckButton.setSelection(false);
-				}
-			}
-		});
-
-		formatFileCheckButton = createCheckButton(checkComposite, "Format file on completion");
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		gd.horizontalSpan = 1;
-		formatFileCheckButton.setLayoutData(gd);
-		formatFileCheckButton.addSelectionListener(new SelectionListener()
-		{
-
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-
-			public void widgetSelected(SelectionEvent e)
-			{
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		Composite buttonComp = new Composite(parent, SWT.TOP);
-		GridLayout layout = new GridLayout(3, false);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		buttonComp.setLayout(layout);
-		gd = new GridData(GridData.HORIZONTAL_ALIGN_END | GridData.VERTICAL_ALIGN_BEGINNING);
-		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 Messages.OutputFileBlock_9;
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		try
-		{
-			inputFilename = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_INPUT_FILE, ""); //$NON-NLS-1$
-			updateDefaultOutputFile();
-
-			boolean useDefault = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_OUTPUT_FILE, true);
-			useDefaultCheckButton.setSelection(useDefault);
-
-			outputFileName = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_FILENAME, defaultOutputFileName);
-			resource = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_FOLDER, defaultResource);
-
-			updateResourceText(useDefault);
-
-			boolean openFileOnCompletion = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_OPEN_FILE, true);
-			openFileCheckButton.setSelection(openFileOnCompletion);
-			
-			boolean formatFileOnCompletion = configuration.getAttribute(XSLLaunchConfigurationConstants.ATTR_FORMAT_FILE, false);
-			formatFileCheckButton.setSelection(formatFileOnCompletion);
-		}
-		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_FOLDER, outputFile);
-
-		String outputFileName = fileNameText.getText();
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_FILENAME, outputFileName);
-
-		boolean openFileOnCompletion = openFileCheckButton.getSelection();
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OPEN_FILE, openFileOnCompletion);
-		
-		boolean formatFileOnCompletion = formatFileCheckButton.getSelection();
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_FORMAT_FILE, formatFileOnCompletion);
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_USE_DEFAULT_OUTPUT_FILE, true);
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_FOLDER, (String)null);
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OUTPUT_FILENAME, (String)null);
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_OPEN_FILE, true);
-		configuration.setAttribute(XSLLaunchConfigurationConstants.ATTR_FORMAT_FILE, false);
-	}
-	
-	protected void updateResourceText(boolean useDefault)
-	{
-		fileNameText.setEnabled(!useDefault);
-		if (useDefault)
-			fileNameText.setText(defaultOutputFileName == null ? "" : defaultOutputFileName); //$NON-NLS-1$
-		else
-			fileNameText.setText(outputFileName == null ? defaultOutputFileName : outputFileName); //$NON-NLS-1$
-		super.updateResourceText(useDefault);
-	}
-
-	private void updateDefaultOutputFile()
-	{
-		try
-		{
-			IPath path = XSLTRuntime.defaultOutputFileForInputFile(inputFilename);
-			// determine whether this path exists in the workspace
-			IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(path);
-			if (files.length > 0)
-			{// inside workspace
-				IPath p = new Path(files[0].getProject().getName());
-				p.append(files[0].getParent().getProjectRelativePath());
-				defaultResource = "${workspace_loc:/"+p.toString()+"}";
-			}
-			else
-			{// outside workspace
-				IPath p = path.removeLastSegments(1);
-				defaultResource = p.toOSString();
-			}
-			defaultOutputFileName = path.lastSegment();
-		}
-		catch (CoreException e)
-		{
-			// do nothing			
-		}
-	}
-}
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 2d5830e..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/OutputTab.java
+++ /dev/null
@@ -1,72 +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.graphics.Image;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.xsl.debug.internal.util.XSLDebugPluginImages;
-import org.eclipse.wst.xsl.debug.internal.util.XSLPluginImageHelper;
-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 OutputFileBlock outputFileBlock;
-
-	public OutputTab(XSLMainTab main)
-	{
-		outputFileBlock = new OutputFileBlock();
-//		outputBlock = new OutputPropertiesBlock(main);
-
-//		setBlocks(new ILaunchConfigurationTab[]
-//		{ outputBlock, outputFileBlock });
-		setBlocks(new ILaunchConfigurationTab[]
-		                              		{ 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);
-	}
-	
-	@Override
-	public String getId()
-	{
-		return "org.eclipse.wst.xsl.internal.debug.ui.tabs.output";
-	}
-
-	public String getName()
-	{
-		return Messages.OutputTab_1;
-	}
-	
-	@Override
-	public Image getImage() {
-		return XSLPluginImageHelper.getInstance().getImage(XSLDebugPluginImages.IMG_OUTPUT_TAB);
-	}
-}
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 38e389d..0000000
--- a/bundles/org.eclipse.wst.xsl.debug.ui/src/org/eclipse/wst/xsl/internal/debug/ui/tabs/output/messages.properties
+++ /dev/null
@@ -1,48 +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
-
-
-
-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
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/.classpath b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/.project b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/.project
deleted file mode 100644
index 6a6f79d..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.jaxp.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d1c389a..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Jul 31 15:17:34 BST 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.jaxp.debug.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 8a0b589..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xsl.jaxp.debug.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.xsl.jaxp.debug.ui.internal.JAXPDebugUIPlugin
-Bundle-Vendor: %vendorName
-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.debug.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xsl.debug.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xsl.launching;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.xsl.jaxp.launching;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jface.text;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.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.400,2.0.0)",
- org.eclipse.jdt.debug.ui;bundle-version="[3.3.0,4.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/about.html b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/about.html
deleted file mode 100644
index ed30003..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.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>August, 2008</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.jaxp.debug.ui/build.properties b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/build.properties
deleted file mode 100644
index 647fcc0..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/,\
-               plugin.properties
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/icons/xslt_processor.gif b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/icons/xslt_processor.gif
deleted file mode 100644
index 5e71289..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/icons/xslt_processor.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.properties b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.properties
deleted file mode 100644
index f81236c..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.jaxp.debug.ui
-vendorName = Eclipse.org
-pluginName = XSL JAXP Debug UI (Incubating)
-pageNameJavaProcessors = Java Processors
-viewNameResult = Result
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.xml b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.xml
deleted file mode 100644
index af972da..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/plugin.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-	<extension point="org.eclipse.debug.ui.launchConfigurationTabs">
-		<tab
-			class="org.eclipse.wst.xsl.jaxp.debug.ui.internal.tabs.processor.XSLProcessorTab2"
-			group="org.eclipse.wst.xsl.internal.debug.ui.launchConfigurationTabGroup.xslt"
-			id="org.eclipse.wst.xsl.debug.ui.jaxp.tabs.processor" name="Processor">
-			<associatedDelegate
-				delegate="org.eclipse.wst.xsl.launching.internal.jaxp.JAXPLaunchConfigurationDelegate">
-			</associatedDelegate>
-			<placement after="org.eclipse.wst.xsl.internal.debug.ui.tabs.output">
-			</placement>
-		</tab>
-		<tab class="org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab"
-			group="org.eclipse.wst.xsl.internal.debug.ui.launchConfigurationTabGroup.xslt"
-			id="org.eclipse.jdt.debug.ui.javaJRETab" name="JRE">
-			<associatedDelegate
-				delegate="org.eclipse.wst.xsl.launching.internal.jaxp.JAXPLaunchConfigurationDelegate">
-			</associatedDelegate>
-			<placement after="org.eclipse.wst.xsl.debug.ui.jaxp.tabs.processor">
-			</placement>
-		</tab>
-		<tab class="org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab"
-			group="org.eclipse.wst.xsl.internal.debug.ui.launchConfigurationTabGroup.xslt"
-			id="org.eclipse.jdt.debug.ui.javaClasspathTab" name="Classpath">
-			<associatedDelegate
-				delegate="org.eclipse.wst.xsl.launching.internal.jaxp.JAXPLaunchConfigurationDelegate">
-			</associatedDelegate>
-			<placement after="org.eclipse.jdt.debug.ui.javaJRETab">
-			</placement>
-		</tab>
-	</extension>
-	<extension point="org.eclipse.ui.preferencePages">
-		<page category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
-			class="org.eclipse.wst.xsl.jaxp.debug.ui.internal.preferences.ProcessorsPreferencePage"
-			id="org.eclipse.wst.xsl.ui.preferences.java" name="%pageNameJavaProcessors">
-		</page>
-	</extension>
- <extension
-       point="org.eclipse.ui.views">
-    <view
-          class="org.eclipse.wst.xsl.jaxp.debug.ui.internal.views.ResultView"
-          id="org.eclipse.wst.xsl.jaxp.debug.ui.resultview"
-          name="%viewNameResult"
-          category="org.eclipse.wst.xml">
-    </view>
- </extension>
-  <extension
-        point="org.eclipse.ui.perspectiveExtensions">
-     <perspectiveExtension
-           targetID="org.eclipse.debug.ui.DebugPerspective">
-        <view
-              id="org.eclipse.wst.xsl.jaxp.debug.ui.view1"
-              minimized="false"
-              relationship="stack"
-              relative="org.eclipse.ui.console.ConsoleView"
-              visible="false">
-        </view>
-     </perspectiveExtension>
-  </extension>
- 
- 	<extension point="org.eclipse.debug.ui.contextViewBindings">
-		<contextViewBinding
-			contextId="org.eclipse.wst.xsl.debug.ui.context"
-			viewId="org.eclipse.wst.xsl.jaxp.debug.ui.resultview">
-		</contextViewBinding>
-	</extension>
- 
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/JAXPDebugUIPlugin.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/JAXPDebugUIPlugin.java
deleted file mode 100644
index d79b21d..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/JAXPDebugUIPlugin.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.debug.ui.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchListener;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.xsl.launching.config.BaseLaunchHelper;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class JAXPDebugUIPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.xsl.jaxp.debug.ui";
-
-	// The shared instance
-	private static JAXPDebugUIPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public JAXPDebugUIPlugin() {
-	}
-
-	/*
-	 * (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 JAXPDebugUIPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/AddProcessorDialog.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/AddProcessorDialog.java
deleted file mode 100644
index f9b92b1..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/AddProcessorDialog.java
+++ /dev/null
@@ -1,384 +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.jaxp.debug.ui.internal.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.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.jaxp.debug.ui.internal.tabs.processor.InstallStandin;
-import org.eclipse.wst.xsl.jaxp.launching.IDebugger;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorJar;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-
-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;
-
-	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(JAXPRuntime.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(Messages.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(Messages.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();
-			}
-		});
-
-	}
-
-	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();
-			}
-		});
-	}
-
-	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(Messages.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]));
-			fLibraryBlock.initializeFrom(standinProcessor, selectedProcessorType);
-		}
-		else
-		{
-			processorTypeField.getCombo().setEnabled(false);
-			processorTypeField.setSelection(new StructuredSelection(standinProcessor.getProcessorType()));
-			processorNameField.setText(standinProcessor.getName());
-
-			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, Messages.AddProcessorDialog_enterName, null);
-		}
-		else
-		{
-			if (block.isDuplicateName(name) && (standinProcessor == null || !name.equals(standinProcessor.getName())))
-			{
-				status = new Status(IStatus.ERROR, XSLDebugUIPlugin.PLUGIN_ID, IStatus.OK, Messages.AddProcessorDialog_duplicateName, null);
-			}
-			else
-			{
-				// IStatus s = ResourcesPlugin.getWorkspace().validateName(name,
-				// IResource.FILE);
-				// if (!s.isOK())
-				// {
-				// status.setError(MessageFormat.format(Messages.AddProcessorDialog_Processor_name_must_be_a_valid_file_name,
-				// new String[]
-				// { s.getMessage() }));
-				// }
-			}
-		}
-		return status;
-	}
-
-	protected IStatus validateVersionStatus()
-	{
-		IStatus status = Status.OK_STATUS;
-		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 = JAXPRuntime.getDebuggers();
-		for (IDebugger element : debuggers)
-		{
-			if (element.getProcessorType().equals(selectedProcessorType))
-				processor.setDebuggerId(element.getId());
-		}
-
-		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.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/BasePreferencePage.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/BasePreferencePage.java
deleted file mode 100644
index 73db6bf..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/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.jaxp.debug.ui.internal.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.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/InstalledProcessorsBlock.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/InstalledProcessorsBlock.java
deleted file mode 100644
index afd9f31..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/InstalledProcessorsBlock.java
+++ /dev/null
@@ -1,646 +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.jaxp.debug.ui.internal.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.layout.GridDataFactory;
-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.jaxp.debug.ui.internal.tabs.processor.InstallStandin;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-
-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(Messages.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(180);
-		column1.setResizable(true);
-		column1.setText(Messages.InstalledProcessorsBlock_1);
-		column1.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				sortByName();
-			}
-		});
-
-		TableColumn column2 = new TableColumn(fTable, SWT.NONE);
-		column2.setWidth(90);
-		column2.setResizable(true);
-		column2.setText(Messages.InstalledProcessorsBlock_2);
-		column2.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			public void widgetSelected(SelectionEvent e)
-			{
-				sortByType();
-			}
-		});
-
-		TableColumn column4 = new TableColumn(fTable, SWT.NONE);
-		column4.setWidth(180);
-		column4.setResizable(true);
-		column4.setText(Messages.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, Messages.InstalledProcessorsBlock_5);
-		fAddButton.addListener(SWT.Selection, new Listener()
-		{
-			public void handleEvent(Event evt)
-			{
-				addProcessor();
-			}
-		});
-
-		fEditButton = createPushButton(buttons, Messages.InstalledProcessorsBlock_6);
-		fEditButton.addListener(SWT.Selection, new Listener()
-		{
-			public void handleEvent(Event evt)
-			{
-				editProcessor();
-			}
-		});
-
-		fRemoveButton = createPushButton(buttons, Messages.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 = JAXPRuntime.getProcessorTypes();
-		for (IProcessorType type : types)
-		{
-			IProcessorInstall[] installs = JAXPRuntime.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 && !((IProcessorInstall)selection.getFirstElement()).isContributed());
-		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);
-		button.setLayoutData(GridDataFactory.fillDefaults().create());
-		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(), JAXPRuntime.getProcessorTypesExclJREDefault(), null);
-		dialog.setTitle(Messages.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(), JAXPRuntime.getProcessorTypesExclJREDefault(), install);
-			dialog.setTitle(Messages.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:
-						if (install.getDebugger() != null)
-						{
-							return install.getDebugger().getName();
-						}
-						return Messages.InstalledProcessorsBlock_8;
-				}
-			}
-			return element.toString();
-		}
-
-		public Image getColumnImage(Object element, int columnIndex)
-		{
-			return null;
-		}
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/Messages.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/Messages.java
deleted file mode 100644
index 43404e1..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/Messages.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.debug.ui.internal.preferences;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS
-{
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.jaxp.debug.ui.internal.preferences.messages"; //$NON-NLS-1$
-	static
-	{
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	
-	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_attributes;
-	public static String AddProcessorDialog_processorName;
-	public static String AddProcessorDialog_processorType;
-	public static String AddProcessorDialog_enterName;
-	public static String AddProcessorDialog_duplicateName;
-
-	public static String ProcessorLibraryBlock_6;
-	public static String ProcessorLibraryBlock_AddButton;
-	public static String ProcessorLibraryBlock_RemoveButton;
-	public static String ProcessorLibraryBlock_AddWorkspaceButton;
-	public static String ProcessorLibraryBlock_FileDialog_Title;
-	public static String ProcessorLibraryBlock_WorkspaceFileDialog_Title;
-	public static String ProcessorLibraryBlock_WorkspaceFileDialog_Message;
-
-	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 ProcessorsPreferencePage_0;
-	public static String ProcessorsPreferencePage_1;
-	public static String ProcessorsPreferencePage_2;
-
-	private Messages()
-	{
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/ProcessorLibraryBlock.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/ProcessorLibraryBlock.java
deleted file mode 100644
index dc6ae1d..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/ProcessorLibraryBlock.java
+++ /dev/null
@@ -1,344 +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.jaxp.debug.ui.internal.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.jaxp.debug.ui.internal.tabs.processor.InstallStandin;
-import org.eclipse.wst.xsl.jaxp.debug.ui.internal.tabs.processor.JarContentProvider;
-import org.eclipse.wst.xsl.jaxp.debug.ui.internal.tabs.processor.JarLabelProvider;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorJar;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-
-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, Messages.ProcessorLibraryBlock_AddWorkspaceButton);
-		addWorkspaceButton.addSelectionListener(this);
-
-		addButton = createPushButton(pathButtonComp, Messages.ProcessorLibraryBlock_AddButton);
-		addButton.addSelectionListener(this);
-
-		removeButton = createPushButton(pathButtonComp, Messages.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, Messages.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(Messages.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] = JAXPRuntime.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(Messages.ProcessorLibraryBlock_WorkspaceFileDialog_Title);
-		dialog.setMessage(Messages.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] = JAXPRuntime.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.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/ProcessorsPreferencePage.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/ProcessorsPreferencePage.java
deleted file mode 100644
index 53e4eef..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/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.jaxp.debug.ui.internal.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.jaxp.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-
-public class ProcessorsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-	private InstalledProcessorsBlock processorsBlock;
-
-	public ProcessorsPreferencePage()
-	{
-		super();
-		// only used when page is shown programatically
-		setTitle(Messages.ProcessorsPreferencePage_0);
-		setDescription(Messages.ProcessorsPreferencePage_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.ProcessorsPreferencePage_2);
-				}
-				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
-					{
-						JAXPRuntime.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 = JAXPRuntime.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.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/messages.properties b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/messages.properties
deleted file mode 100644
index cfd4e7f..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/preferences/messages.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-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_attributes=Attributes:
-AddProcessorDialog_enterName=A name must be entered for this processor
-AddProcessorDialog_duplicateName=The name has already been used
-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
-
-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.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/AttributeDialog.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/AttributeDialog.java
deleted file mode 100644
index 885ec53..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/AttributeDialog.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.debug.ui.internal.tabs.processor;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.StatusDialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-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.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-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.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xsl.jaxp.launching.IAttribute;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-import org.eclipse.wst.xsl.jaxp.launching.LaunchAttributes;
-import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
-
-public class AttributeDialog extends StatusDialog
-{
-	private Table table;
-	private TableViewer tViewer;
-	private Text text;
-	private List<IAttribute> attributes = new ArrayList<IAttribute>();
-	private List<IAttribute> selectedAttributes = new ArrayList<IAttribute>();
-
-	public AttributeDialog(Shell parent, LaunchAttributes launchAttributes)
-	{
-		super(parent);
-		setTitle("Select Processor Attributes");
-		
-		Set<String> attributeSet = new HashSet<String>();
-		for (LaunchAttribute att : launchAttributes.getAttributes())
-		{
-			attributeSet.add(att.uri);
-		}
-		for (IProcessorType type : JAXPRuntime.getProcessorTypes())
-		{
-			for (IAttribute attribute : type.getAttributes())
-			{
-				if (!attributeSet.contains(attribute.getURI()))
-				{
-					attributeSet.add(attribute.getURI());
-					attributes.add(attribute);
-				}
-			}
-		}
-	}
-	
-	@Override
-	protected Control createDialogArea(Composite parent)
-	{
-		Composite comp = new Composite(parent,SWT.NONE);
-		GridData gd = new GridData(SWT.FILL,SWT.FILL,true,true);
-		gd.widthHint = 400;
-		comp.setLayoutData(gd);
-		comp.setLayout(new GridLayout());
-		
-		Label label = new Label(comp,SWT.NONE);
-		label.setText("Select one or more attributes to set on the XSLT processor.");
-		
-		
-		table = new Table(comp,SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL | SWT.MULTI);
-		table.setHeaderVisible(false);
-		gd = new GridData(SWT.FILL,SWT.FILL,true,true);
-		gd.verticalIndent = 10;
-		gd.heightHint = 200;
-		table.setLayoutData(gd);
-		
-		tViewer = new TableViewer(table);
-		tViewer.setContentProvider(new IStructuredContentProvider()
-		{
-			public Object[] getElements(Object inputElement)
-			{
-				return attributes.toArray(new IAttribute[0]);
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-			}
-		});
-		tViewer.setLabelProvider(new LabelProvider(){
-			@Override
-			public String getText(Object element)
-			{
-				IAttribute attribute = (IAttribute)element;
-				return attribute.getURI();
-			}
-		});
-		tViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2)
-			{
-				IAttribute a1 = (IAttribute) e1;
-				IAttribute a2 = (IAttribute) e2;
-				return a1.getURI().compareTo(a2.getURI());
-			}
-		});
-		tViewer.addSelectionChangedListener(new ISelectionChangedListener(){
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IStructuredSelection sel = (IStructuredSelection)event.getSelection();
-				selectedAttributes = sel.toList();
-				if (sel.isEmpty())
-					text.setText("");
-				else
-				{
-					IAttribute attribute = (IAttribute)sel.getFirstElement(); 
-					text.setText(attribute.getDescription());
-				}
-			}
-		});
-		tViewer.addDoubleClickListener(new IDoubleClickListener(){
-			public void doubleClick(DoubleClickEvent event)
-			{
-				buttonPressed(IDialogConstants.OK_ID);
-			}
-		});
-		tViewer.setInput(attributes);
-		
-		text = new Text(comp,SWT.BORDER | SWT.WRAP | SWT.READ_ONLY | SWT.V_SCROLL);
-		text.setEditable(false);
-		gd = new GridData(SWT.FILL,SWT.FILL,true,false);
-		gd.heightHint = 80;
-		text.setLayoutData(gd);
-		
-		if (attributes.size() > 0)
-		{
-			tViewer.setSelection(new StructuredSelection(tViewer.getElementAt(0)), true);
-		}
-		
-		return comp;
-	}
-	
-	public List<IAttribute> getAttributes()
-	{
-		return selectedAttributes;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/AttributesBlock.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/AttributesBlock.java
deleted file mode 100644
index f97f11a..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/AttributesBlock.java
+++ /dev/null
@@ -1,365 +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.jaxp.debug.ui.internal.tabs.processor;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-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.viewers.CellEditor;
-import org.eclipse.jface.viewers.CellLabelProvider;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-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.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-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.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.jaxp.debug.ui.internal.JAXPDebugUIPlugin;
-import org.eclipse.wst.xsl.jaxp.launching.IAttribute;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-import org.eclipse.wst.xsl.jaxp.launching.LaunchAttributes;
-import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
-
-public class AttributesBlock extends AbstractTableBlock
-{
-	private Table table;
-	private TableViewer tViewer;
-	private LaunchAttributes attributes;
-	private Button removeButton;
-	private Map<String,IAttribute> attributeUris = new HashMap<String,IAttribute>();
-	
-	public AttributesBlock()
-	{
-		for (IProcessorType type : JAXPRuntime.getProcessorTypes())
-		{
-			for (IAttribute attribute : type.getAttributes())
-			{
-				attributeUris.put(attribute.getURI(), attribute);
-			}
-		}
-	}
-
-	@Override
-	protected IDialogSettings getDialogSettings()
-	{
-		return XSLDebugUIPlugin.getDefault().getDialogSettings();
-	}
-
-	@Override
-	protected String getQualifier()
-	{
-		return JAXPDebugUIPlugin.PLUGIN_ID+"."+getClass().getCanonicalName();
-	}
-
-	@Override
-	protected Table getTable()
-	{
-		return table;
-	}
-
-	public void createControl(Composite parent)
-	{
-		TabItem item = new TabItem((TabFolder)parent,SWT.NONE);
-		item.setText("Attributes");
-		
-		Composite composite = new Composite(parent,SWT.NONE);
-		GridLayout layout = new GridLayout(2,false);
-		layout.marginBottom = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		item.setControl(composite);
-		
-		table = new Table(composite,SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL | SWT.MULTI);
-		table.setHeaderVisible(true);
-		table.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		table.addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent event) {
-				if (event.character == SWT.DEL && event.stateMask == 0) {
-					performRemove();
-				}
-			}
-		});
-		
-		TableColumn tc1 = new TableColumn(table,SWT.NONE);
-		tc1.setText("Name");
-		tc1.setWidth(350);
-		tc1.setResizable(true);
-		
-		TableColumn tc2 = new TableColumn(table,SWT.NONE);
-		tc2.setText("Value");
-		tc2.setWidth(50);
-		tc2.setResizable(true);
-		
-		Composite buttonComp = new Composite(composite,SWT.FILL);
-		buttonComp.setLayoutData(new GridData(SWT.FILL,SWT.TOP,false,false));
-		GridLayout gl = new GridLayout();
-		gl.marginWidth = 0;
-		buttonComp.setLayout(gl);
-		
-		Button addButton = new Button(buttonComp,SWT.PUSH);
-		addButton.setText("Add");
-		addButton.setLayoutData(new GridData(SWT.FILL,SWT.TOP,false,false));
-		addButton.addSelectionListener(new SelectionListener(){
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-			public void widgetSelected(SelectionEvent e)
-			{
-				AttributeDialog dialog = new AttributeDialog(getShell(),attributes);
-				if (dialog.open() == AttributeDialog.OK)
-				{
-					List<IAttribute> newAttributes = dialog.getAttributes();
-					LaunchAttribute first = null;
-					for (IAttribute attribute : newAttributes)
-					{
-						LaunchAttribute att = new LaunchAttribute(attribute.getURI(),"string",null);
-						if (first == null)
-							first = att;
-						attributes.addAttribute(att);
-					}
-					if (newAttributes.size() > 0)
-					{
-						tViewer.refresh();
-						tViewer.setSelection(new StructuredSelection(first), true);
-						tViewer.editElement(first, 1);
-						updateLaunchConfigurationDialog();
-					}
-				}
-			}
-		});
-		
-		removeButton = new Button(buttonComp,SWT.PUSH);
-		removeButton.setText("Remove");
-		removeButton.setLayoutData(new GridData(SWT.FILL,SWT.TOP,false,false));
-		removeButton.addSelectionListener(new SelectionListener(){
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-			public void widgetSelected(SelectionEvent e)
-			{
-				performRemove();
-			}
-		});
-		
-		setControl(table);
-		
-		tViewer = new TableViewer(table);
-		tViewer.setContentProvider(new IStructuredContentProvider()
-		{
-			public Object[] getElements(Object inputElement)
-			{
-				return attributes.getAttributes().toArray(new LaunchAttribute[0]);
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-				attributes = (LaunchAttributes) newInput;
-			}
-		});
-		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);
-			}
-		});
-		tViewer.addSelectionChangedListener(new ISelectionChangedListener(){
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				updateRemoveButton();
-			}
-		});
-		
-		TableViewerColumn tvc1 = new TableViewerColumn(tViewer,tc1);
-		tvc1.setLabelProvider(new CellLabelProvider(){
-			@Override
-			public void update(ViewerCell cell)
-			{
-				LaunchAttribute tv = (LaunchAttribute) cell.getElement();
-				cell.setText(tv.uri);
-			}
-			
-			@Override
-			public int getToolTipTimeDisplayed(Object object)
-			{
-				return 5000;
-			}
-			
-			@Override
-			public String getToolTipText(Object element)
-			{
-				LaunchAttribute tv = (LaunchAttribute) element;
-				return attributeUris.get(tv.uri).getDescription();
-			}
-			
-		});
-		
-//		ColumnViewerToolTipSupport.enableFor(tViewer);
-		
-		TableViewerColumn tvc2 = new TableViewerColumn(tViewer,tc2);
-		tvc2.setLabelProvider(new CellLabelProvider(){
-			@Override
-			public void update(ViewerCell cell)
-			{
-				LaunchAttribute tv = (LaunchAttribute) cell.getElement();
-				cell.setText(tv.value);
-			}
-		});
-		
-		tvc2.setEditingSupport(new EditingSupport(tViewer){
-
-			@Override
-			protected boolean canEdit(Object element)
-			{
-				return true;
-			}
-
-			@Override
-			protected CellEditor getCellEditor(Object element)
-			{
-				return new TextCellEditor(table);
-			}
-
-			@Override
-			protected Object getValue(Object element)
-			{
-				LaunchAttribute tv = (LaunchAttribute)element;
-				return tv.value == null ? "" : tv.value;
-			}
-
-			@Override
-			protected void setValue(Object element, Object value)
-			{
-				LaunchAttribute tv = (LaunchAttribute)element;
-				tv.setValue((String)value);
-				updateLaunchConfigurationDialog();
-				tViewer.update(tv, null);
-			}
-			
-		});
-		
-		restoreColumnSettings();
-	}
-
-	protected void updateRemoveButton()
-	{
-		removeButton.setEnabled(!tViewer.getSelection().isEmpty());
-	}
-
-	public String getName()
-	{
-		return Messages.getString("AttributesBlock.16"); //$NON-NLS-1$
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-	}
-
-	private void initializeAttributesFromStorage(ILaunchConfiguration configuration) throws CoreException
-	{
-		String s = configuration.getAttribute(JAXPLaunchConfigurationConstants.ATTR_ATTRIBUTES, (String) null);
-		if (s != null && s.length() > 0)
-		{
-			attributes = LaunchAttributes.fromXML(new ByteArrayInputStream(s.getBytes()));
-		}
-		else
-		{
-			attributes = new LaunchAttributes();
-		}
-		tViewer.setInput(attributes);
-		updateRemoveButton();
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		try
-		{
-			initializeAttributesFromStorage(configuration);
-		}
-		catch (CoreException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		try
-		{
-			String xml = attributes.toXML();
-			configuration.setAttribute(JAXPLaunchConfigurationConstants.ATTR_ATTRIBUTES, xml);
-		}
-		catch (ParserConfigurationException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		catch (IOException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		catch (TransformerException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	private void performRemove()
-	{
-		IStructuredSelection sel = (IStructuredSelection)tViewer.getSelection();
-		for (Iterator iterator = sel.iterator(); iterator.hasNext();)
-		{
-			LaunchAttribute att = (LaunchAttribute) iterator.next();
-			attributes.removeAtribute(att.uri);
-		}
-		tViewer.refresh();
-		updateLaunchConfigurationDialog();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/InstallStandin.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/InstallStandin.java
deleted file mode 100644
index 35b3927..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/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.jaxp.debug.ui.internal.tabs.processor;
-
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorJar;
-import org.eclipse.wst.xsl.jaxp.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.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/JarContentProvider.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/JarContentProvider.java
deleted file mode 100644
index f37a0de..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/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.jaxp.debug.ui.internal.tabs.processor;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.xsl.jaxp.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.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/JarLabelProvider.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/JarLabelProvider.java
deleted file mode 100644
index 5ded313..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/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.jaxp.debug.ui.internal.tabs.processor;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.wst.xsl.jaxp.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.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/Messages.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/Messages.java
deleted file mode 100644
index ea96ce6..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.debug.ui.internal.tabs.processor;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.jaxp.debug.ui.internal.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.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/OutputPropertiesBlock.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/OutputPropertiesBlock.java
deleted file mode 100644
index 94989c5..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/OutputPropertiesBlock.java
+++ /dev/null
@@ -1,376 +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.jaxp.debug.ui.internal.tabs.processor;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-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.viewers.CellEditor;
-import org.eclipse.jface.viewers.CellLabelProvider;
-import org.eclipse.jface.viewers.EditingSupport;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerCell;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-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.TabFolder;
-import org.eclipse.swt.widgets.TabItem;
-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.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.jaxp.debug.ui.internal.JAXPDebugUIPlugin;
-import org.eclipse.wst.xsl.jaxp.launching.IOutputProperty;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-import org.eclipse.wst.xsl.jaxp.launching.LaunchProperties;
-
-public class OutputPropertiesBlock extends AbstractTableBlock
-{
-	private Table table;
-	private TableViewer tViewer;
-	private LaunchProperties properties;
-	private Button removeButton;
-	private Map<String,IOutputProperty> propertyUris = new HashMap<String,IOutputProperty>();
-	
-	public OutputPropertiesBlock()
-	{
-		for (IProcessorType type : JAXPRuntime.getProcessorTypes())
-		{
-			for (IOutputProperty property : type.getOutputProperties())
-			{
-				propertyUris.put(property.getURI(), property);
-			}
-		}
-	}
-
-	@Override
-	protected IDialogSettings getDialogSettings()
-	{
-		return XSLDebugUIPlugin.getDefault().getDialogSettings();
-	}
-
-	@Override
-	protected String getQualifier()
-	{
-		return JAXPDebugUIPlugin.PLUGIN_ID+"."+getClass().getCanonicalName();
-	}
-
-	@Override
-	protected Table getTable()
-	{
-		return table;
-	}
-
-	public void createControl(Composite parent)
-	{
-		TabItem item = new TabItem((TabFolder)parent,SWT.NONE);
-		item.setText("Output Properties");
-		
-		Composite composite = new Composite(parent,SWT.NONE);
-		GridLayout layout = new GridLayout(2,false);
-		layout.marginBottom = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		item.setControl(composite);
-		
-		table = new Table(composite,SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL | SWT.MULTI);
-		table.setHeaderVisible(true);
-		table.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		table.addKeyListener(new KeyAdapter() {
-			public void keyPressed(KeyEvent event) {
-				if (event.character == SWT.DEL && event.stateMask == 0) {
-					performRemove();
-				}
-			}
-		});
-
-		
-		TableColumn tc1 = new TableColumn(table,SWT.NONE);
-		tc1.setText("Name");
-		tc1.setWidth(350);
-		tc1.setResizable(true);
-		
-		TableColumn tc2 = new TableColumn(table,SWT.NONE);
-		tc2.setText("Value");
-		tc2.setWidth(50);
-		tc2.setResizable(true);
-		
-		Composite buttonComp = new Composite(composite,SWT.FILL);
-		buttonComp.setLayoutData(new GridData(SWT.FILL,SWT.TOP,false,false));
-		GridLayout gl = new GridLayout();
-		gl.marginWidth = 0;
-		buttonComp.setLayout(gl);
-		
-		Button addButton = new Button(buttonComp,SWT.PUSH);
-		addButton.setText("Add");
-		addButton.setLayoutData(new GridData(SWT.FILL,SWT.TOP,false,false));
-		addButton.addSelectionListener(new SelectionListener(){
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-			public void widgetSelected(SelectionEvent e)
-			{
-				OutputPropertyDialog dialog = new OutputPropertyDialog(getShell(),properties);
-				if (dialog.open() == AttributeDialog.OK)
-				{
-					List<IOutputProperty> newProperties = dialog.getOutpuProperties();
-					String first = null;
-					for (IOutputProperty property : newProperties)
-					{
-						String att = property.getURI();
-						if (first == null)
-							first = att;
-						properties.setProperty(property.getURI(), null);
-					}
-					if (newProperties.size() > 0)
-					{
-						tViewer.refresh();
-						tViewer.setSelection(new StructuredSelection(first), true);
-						tViewer.editElement(first, 1);
-						updateLaunchConfigurationDialog();
-					}
-				}
-			}
-		});
-		
-		removeButton = new Button(buttonComp,SWT.PUSH);
-		removeButton.setText("Remove");
-		removeButton.setLayoutData(new GridData(SWT.FILL,SWT.TOP,false,false));
-		removeButton.addSelectionListener(new SelectionListener(){
-			public void widgetDefaultSelected(SelectionEvent e)
-			{
-			}
-			public void widgetSelected(SelectionEvent e)
-			{
-				performRemove();
-			}
-		});
-		
-		setControl(table);
-		
-		tViewer = new TableViewer(table);
-		tViewer.setContentProvider(new IStructuredContentProvider()
-		{
-			public Object[] getElements(Object inputElement)
-			{
-				return properties.getProperties().keySet().toArray(new String[0]);
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-			}
-		});
-		tViewer.setSorter(new ViewerSorter());
-		tViewer.addSelectionChangedListener(new ISelectionChangedListener(){
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				updateRemoveButton();
-			}
-		});
-		
-		TableViewerColumn tvc1 = new TableViewerColumn(tViewer,tc1);
-		tvc1.setLabelProvider(new CellLabelProvider(){
-			@Override
-			public void update(ViewerCell cell)
-			{
-				String tv = (String) cell.getElement();
-				cell.setText(tv);
-			}
-			
-			@Override
-			public int getToolTipTimeDisplayed(Object object)
-			{
-				return 5000;
-			}
-			
-			@Override
-			public String getToolTipText(Object element)
-			{
-				String tv = (String) element;
-				return propertyUris.get(tv).getDescription();
-			}
-			
-		});
-		
-//		ColumnViewerToolTipSupport.enableFor(tViewer);
-		
-		TableViewerColumn tvc2 = new TableViewerColumn(tViewer,tc2);
-		tvc2.setLabelProvider(new CellLabelProvider(){
-			@Override
-			public void update(ViewerCell cell)
-			{
-				String tv = (String) cell.getElement();
-				String val = properties.getProperty(tv);
-				cell.setText(val == null ? "" : val);
-			}
-		});
-		
-		tvc2.setEditingSupport(new EditingSupport(tViewer){
-
-			@Override
-			protected boolean canEdit(Object element)
-			{
-				return true;
-			}
-
-			@Override
-			protected CellEditor getCellEditor(Object element)
-			{
-				return new TextCellEditor(table);
-			}
-
-			@Override
-			protected Object getValue(Object element)
-			{
-				String tv = (String)element;
-				String val = properties.getProperty(tv);
-				return val == null ? "" : val;
-			}
-
-			@Override
-			protected void setValue(Object element, Object value)
-			{
-				String tv = (String)element;
-				properties.setProperty(tv, (String)value);
-				updateLaunchConfigurationDialog();
-				tViewer.update(tv, null);
-			}
-			
-		});
-		
-		restoreColumnSettings();
-	}
-
-	protected void updateRemoveButton()
-	{
-		removeButton.setEnabled(!tViewer.getSelection().isEmpty());
-	}
-
-	public String getName()
-	{
-		return Messages.getString("AttributesBlock.16"); //$NON-NLS-1$
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-//		LaunchProperties p = new LaunchProperties();
-//		p.setProperty("indent", "yes");
-//		try
-//		{
-//			String xml = p.toXML();
-//			configuration.setAttribute(JAXPLaunchConfigurationConstants.ATTR_OUTPUT_PROPERTIES, xml);
-//		}
-//		catch (ParserConfigurationException e)
-//		{
-//			XSLDebugUIPlugin.log(e);
-//		}
-//		catch (IOException e)
-//		{
-//			XSLDebugUIPlugin.log(e);
-//		}
-//		catch (TransformerException e)
-//		{
-//			XSLDebugUIPlugin.log(e);
-//		}
-	}
-
-	private void initializePropertiesFromStorage(ILaunchConfiguration configuration) throws CoreException
-	{
-		String s = configuration.getAttribute(JAXPLaunchConfigurationConstants.ATTR_OUTPUT_PROPERTIES, (String) null);
-		if (s != null && s.length() > 0)
-		{
-			properties = LaunchProperties.fromXML(new ByteArrayInputStream(s.getBytes()));
-		}
-		else
-		{
-			properties = new LaunchProperties();
-		}
-		tViewer.setInput(properties);
-		updateRemoveButton();
-	}
-
-	public void initializeFrom(ILaunchConfiguration configuration)
-	{
-		try
-		{
-			initializePropertiesFromStorage(configuration);
-		}
-		catch (CoreException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		try
-		{
-			String xml = properties.toXML();
-			configuration.setAttribute(JAXPLaunchConfigurationConstants.ATTR_OUTPUT_PROPERTIES, xml);
-		}
-		catch (ParserConfigurationException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		catch (IOException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-		catch (TransformerException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	private void performRemove()
-	{
-		IStructuredSelection sel = (IStructuredSelection)tViewer.getSelection();
-		for (Iterator iterator = sel.iterator(); iterator.hasNext();)
-		{
-			String att = (String) iterator.next();
-			properties.removeProperty(att);
-		}
-		tViewer.refresh();
-		updateLaunchConfigurationDialog();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/OutputPropertyDialog.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/OutputPropertyDialog.java
deleted file mode 100644
index 2fc7b7c..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/OutputPropertyDialog.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.debug.ui.internal.tabs.processor;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.StatusDialog;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-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.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-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.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xsl.jaxp.launching.IOutputProperty;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-import org.eclipse.wst.xsl.jaxp.launching.LaunchProperties;
-
-public class OutputPropertyDialog extends StatusDialog
-{
-	private Table table;
-	private TableViewer tViewer;
-	private Text text;
-	private List<IOutputProperty> properties = new ArrayList<IOutputProperty>();
-	private List<IOutputProperty> selectedProperties = new ArrayList<IOutputProperty>();
-
-	public OutputPropertyDialog(Shell parent, LaunchProperties launchProperties)
-	{
-		super(parent);
-		setTitle("Select Output Properties");
-		
-		Set<String> propertySet = new HashSet<String>();
-		for (String att : launchProperties.getProperties().keySet())
-		{
-			propertySet.add(att);
-		}
-		for (IProcessorType type : JAXPRuntime.getProcessorTypes())
-		{
-			for (IOutputProperty property : type.getOutputProperties())
-			{
-				if (!propertySet.contains(property.getURI()))
-				{
-					propertySet.add(property.getURI());
-					properties.add(property);
-				}
-			}
-		}
-	}
-	
-	@Override
-	protected Control createDialogArea(Composite parent)
-	{
-		Composite comp = new Composite(parent,SWT.NONE);
-		GridData gd = new GridData(SWT.FILL,SWT.FILL,true,true);
-		gd.widthHint = 400;
-		comp.setLayoutData(gd);
-		comp.setLayout(new GridLayout());
-		
-		Label label = new Label(comp,SWT.NONE);
-		label.setText("Select one or more output properties for the transformation.");
-		
-		
-		table = new Table(comp,SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL | SWT.MULTI);
-		table.setHeaderVisible(false);
-		gd = new GridData(SWT.FILL,SWT.FILL,true,true);
-		gd.verticalIndent = 10;
-		gd.heightHint = 200;
-		table.setLayoutData(gd);
-		
-		tViewer = new TableViewer(table);
-		tViewer.setContentProvider(new IStructuredContentProvider()
-		{
-			public Object[] getElements(Object inputElement)
-			{
-				return properties.toArray(new IOutputProperty[0]);
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-			}
-		});
-		tViewer.setLabelProvider(new LabelProvider(){
-			@Override
-			public String getText(Object element)
-			{
-				IOutputProperty property = (IOutputProperty)element;
-				return property.getURI();
-			}
-		});
-		tViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			public int compare(Viewer viewer, Object e1, Object e2)
-			{
-				IOutputProperty a1 = (IOutputProperty) e1;
-				IOutputProperty a2 = (IOutputProperty) e2;
-				return a1.getURI().compareTo(a2.getURI());
-			}
-		});
-		tViewer.addSelectionChangedListener(new ISelectionChangedListener(){
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IStructuredSelection sel = (IStructuredSelection)event.getSelection();
-				selectedProperties = sel.toList();
-				if (sel.isEmpty())
-					text.setText("");
-				else
-				{
-					IOutputProperty property = (IOutputProperty)sel.getFirstElement(); 
-					text.setText(property.getDescription());
-				}
-			}
-		});
-		tViewer.addDoubleClickListener(new IDoubleClickListener(){
-			public void doubleClick(DoubleClickEvent event)
-			{
-				buttonPressed(IDialogConstants.OK_ID);
-			}
-		});
-		tViewer.setInput(properties);
-		
-		text = new Text(comp,SWT.BORDER | SWT.WRAP | SWT.READ_ONLY | SWT.V_SCROLL);
-		text.setEditable(false);
-		gd = new GridData(SWT.FILL,SWT.FILL,true,false);
-		gd.heightHint = 80;
-		text.setLayoutData(gd);
-		
-		if (properties.size() > 0)
-		{
-			tViewer.setSelection(new StructuredSelection(tViewer.getElementAt(0)), true);
-		}
-		
-		return comp;
-	}
-	
-	public List<IOutputProperty> getOutpuProperties()
-	{
-		return selectedProperties;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorBlock.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorBlock.java
deleted file mode 100644
index 2353884..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorBlock.java
+++ /dev/null
@@ -1,376 +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.jaxp.debug.ui.internal.tabs.processor;
-
-import java.util.HashSet;
-import java.util.Set;
-
-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.Label;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.jaxp.debug.ui.internal.preferences.ProcessorsPreferencePage;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.ITransformerFactory;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-
-public class ProcessorBlock extends AbstractLaunchConfigurationTab
-{
-	private Button usePreferencesRadio;
-	private Button alterPreferencesButton;
-	private Button overridePreferencesRadio;
-	private Combo runCombo;
-	private Button installedProcessorsButton;
-	private ComboViewer runComboViewer;
-	private ComboViewer factoryComboViewer;
-	private ITransformerFactory currentFactory;
-
-	public ProcessorBlock()
-	{
-	}
-
-	public void createControl(Composite parent)
-	{
-		Font font = parent.getFont();
-
-		Composite group = new Composite(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(3, 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(JAXPRuntime.getProcessors());
-		runComboViewer.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				IStructuredSelection sel = (IStructuredSelection) event.getSelection();
-				if (!sel.isEmpty())
-				{
-					IProcessorInstall processor = (IProcessorInstall) sel.getFirstElement();
-					
-					if (processor.getProcessorType().getTransformerFactories().length > 1)
-						factoryComboViewer.getCombo().setVisible(true);
-					else
-						factoryComboViewer.getCombo().setVisible(false);
-
-					factoryComboViewer.setInput(processor.getProcessorType());
-					
-					boolean found = false;
-					for (ITransformerFactory tf : processor.getProcessorType().getTransformerFactories())
-					{
-						if (tf.equals(currentFactory))
-						{
-							found = true;
-							break;
-						}
-					}
-					if (!found)
-					{
-						currentFactory = processor.getProcessorType().getDefaultTransformerFactory();
-						if (currentFactory!=null)
-							factoryComboViewer.setSelection(new StructuredSelection(currentFactory));
-					}
-				}
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-		Combo factoryCombo = new Combo(settingsComp, SWT.READ_ONLY | SWT.SINGLE);
-		factoryCombo.setLayoutData(new GridData(80,SWT.DEFAULT));
-		factoryComboViewer = new ComboViewer(factoryCombo);
-		factoryComboViewer.setContentProvider(new IStructuredContentProvider(){
-
-			private IProcessorType type;
-			
-			public Object[] getElements(Object inputElement)
-			{
-				return type.getTransformerFactories();
-			}
-
-			public void dispose()
-			{
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-			{
-				this.type = (IProcessorType)newInput;
-			}
-			
-		});
-		factoryComboViewer.setLabelProvider(new LabelProvider(){
-			@Override
-			public String getText(Object element)
-			{
-				ITransformerFactory f = (ITransformerFactory)element;
-				return f.getName(); // + " - " + f.getFactoryClass();
-			}
-		});
-		factoryComboViewer.addSelectionChangedListener(new ISelectionChangedListener()
-		{
-
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				currentFactory = (ITransformerFactory)((IStructuredSelection)event.getSelection()).getFirstElement();
-				updateLaunchConfigurationDialog();
-			}
-		});
-
-//		overridePreferencesButton = new Button(group,SWT.CHECK);
-//		overridePreferencesButton.setText("Override preferences");
-//		gd = new GridData(SWT.NONE,SWT.NONE,false,false);
-//		overridePreferencesButton.setLayoutData(gd);
-//		overridePreferencesButton.addSelectionListener(new SelectionListener(){
-//			public void widgetDefaultSelected(SelectionEvent e)
-//			{}
-//			
-//			public void widgetSelected(SelectionEvent e)
-//			{
-//				firePreferenceProcessorChanged(overridePreferencesButton.getSelection());
-//			}
-//		});
-	}
-	
-
-	private void preferencesSelected()
-	{
-		alterPreferencesButton.setEnabled(true);
-		installedProcessorsButton.setEnabled(false);
-		runCombo.setEnabled(false);
-		factoryComboViewer.getCombo().setEnabled(false);
-		runComboViewer.setSelection(new StructuredSelection(getRunProcessorPreference()), true);
-	}
-
-	private void overrideSelected()
-	{
-		alterPreferencesButton.setEnabled(false);
-		installedProcessorsButton.setEnabled(true);
-		factoryComboViewer.getCombo().setEnabled(true);
-		runCombo.setEnabled(true);
-	}
-
-	private void showPrefPage(String id, IPreferencePage page)
-	{
-		XSLDebugUIPlugin.showPreferencePage(id, page);
-		// now refresh everything
-		runComboViewer.setInput(JAXPRuntime.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(JAXPLaunchConfigurationConstants.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(JAXPLaunchConfigurationConstants.ATTR_PROCESSOR, (String) null);
-				if (runId != null)
-					runInstall = JAXPRuntime.getProcessor(runId);
-				if (runInstall == null)
-					runInstall = getRunProcessorPreference();
-				runComboViewer.setSelection(new StructuredSelection(runInstall));
-				
-
-				String factoryId = configuration.getAttribute(JAXPLaunchConfigurationConstants.ATTR_TRANSFORMER_FACTORY, (String) null);
-				if (factoryId == null)
-				{
-					currentFactory = runInstall.getProcessorType().getDefaultTransformerFactory();
-				}
-				else
-				{
-					for (ITransformerFactory tf : runInstall.getProcessorType().getTransformerFactories())
-					{
-						if (tf.getFactoryClass().equals(factoryId))
-						{
-							currentFactory = tf;
-							break;
-						}
-					}
-				}
-				
-				if (currentFactory == null)
-				{
-					currentFactory = runInstall.getProcessorType().getDefaultTransformerFactory();
-				}
-				if (currentFactory != null)
-				{
-					factoryComboViewer.setSelection(new StructuredSelection(currentFactory), true);
-				}
-			}
-		}
-		catch (CoreException e)
-		{
-			XSLDebugUIPlugin.log(e);
-		}
-	}
-
-	private IProcessorInstall getRunProcessorPreference()
-	{
-		return JAXPRuntime.getDefaultProcessor();
-	}
-
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		boolean usePreferences = usePreferencesRadio.getSelection();
-		configuration.setAttribute(JAXPLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, usePreferences);
-		if (!usePreferences)
-		{
-			IProcessorInstall runprocessor = (IProcessorInstall) ((IStructuredSelection) runComboViewer.getSelection()).getFirstElement();
-			configuration.setAttribute(JAXPLaunchConfigurationConstants.ATTR_PROCESSOR, runprocessor.getId());
-			configuration.setAttribute(JAXPLaunchConfigurationConstants.ATTR_TRANSFORMER_FACTORY, currentFactory == null ? null : currentFactory.getFactoryClass());
-		}
-	}
-
-	public void setDefaults(ILaunchConfigurationWorkingCopy configuration)
-	{
-		configuration.setAttribute(JAXPLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, true);
-		configuration.setAttribute(JAXPLaunchConfigurationConstants.ATTR_PROCESSOR, (String) null);
-	}
-
-	private class ComboContentProvider implements IStructuredContentProvider
-	{
-		public Object[] getElements(Object inputElement)
-		{
-			return JAXPRuntime.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.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorDescriptor.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorDescriptor.java
deleted file mode 100644
index 83bf92f..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/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.jaxp.debug.ui.internal.tabs.processor;
-
-public abstract class ProcessorDescriptor
-{
-	public abstract String getDescription();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorDetailsDialog.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorDetailsDialog.java
deleted file mode 100644
index e0621f5..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/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.jaxp.debug.ui.internal.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.jaxp.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.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorMessages.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorMessages.java
deleted file mode 100644
index ba4e159..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorMessages.java
+++ /dev/null
@@ -1,37 +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.jaxp.debug.ui.internal.tabs.processor;
-
-import org.eclipse.osgi.util.NLS;
-
-class ProcessorMessages extends NLS
-{
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.jaxp.debug.ui.internal.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_1;
-	public static String ProcessorDetailsDialog_Title;
-	public static String ProcessorDetailsDialog_installName;
-	public static String ProcessorDetailsDialog_installType;
-	public static String ProcessorDetailsDialog_installClasspath;
-
-	static
-	{
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, ProcessorMessages.class);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorMessages.properties b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorMessages.properties
deleted file mode 100644
index caa7275..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/ProcessorMessages.properties
+++ /dev/null
@@ -1,14 +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_1=&Installed processors...
-
-ProcessorDetailsDialog_Title=Built-in XSLT Processor
-ProcessorDetailsDialog_installName=Name:
-ProcessorDetailsDialog_installType=Type:
-ProcessorDetailsDialog_installClasspath=Libraries:
-
-
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/XSLProcessorTab2.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/XSLProcessorTab2.java
deleted file mode 100644
index 2bab50e..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/XSLProcessorTab2.java
+++ /dev/null
@@ -1,97 +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 - bug 223557 - Added images contributed by Holger Voormann
- *******************************************************************************/
-package org.eclipse.wst.xsl.jaxp.debug.ui.internal.tabs.processor;
-
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.jface.resource.ImageDescriptor;
-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.TabFolder;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLLaunchConfigurationTab;
-import org.eclipse.wst.xsl.jaxp.debug.ui.internal.JAXPDebugUIPlugin;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorInvoker;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-
-public class XSLProcessorTab2 extends XSLLaunchConfigurationTab
-{
-	private final ProcessorBlock processorBlock;
-	private final AttributesBlock attributesBlock;
-	private final OutputPropertiesBlock outputPropertiesBlock;
-	private Image image;
-
-	public XSLProcessorTab2()
-	{
-		attributesBlock = new AttributesBlock();
-		outputPropertiesBlock = new OutputPropertiesBlock();
-		processorBlock = new ProcessorBlock();
-		
-		setBlocks(new ILaunchConfigurationTab[]
-		{ processorBlock , attributesBlock, outputPropertiesBlock });
-	}
-
-	@Override
-	public void createControl(Composite parent)
-	{
-		super.createControl(parent);
-		Composite comp = (Composite) getControl();
-
-		processorBlock.createControl(comp);
-		
-		TabFolder tabFolder = new TabFolder(comp,SWT.NONE);
-		tabFolder.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-
-		outputPropertiesBlock.createControl(tabFolder);		
-		attributesBlock.createControl(tabFolder);		
-	}
-
-	@Override
-	public void performApply(ILaunchConfigurationWorkingCopy configuration)
-	{
-		super.performApply(configuration);
-		IProcessorInvoker invoker = JAXPRuntime.getProcessorInvokers()[0];
-		configuration.setAttribute(JAXPLaunchConfigurationConstants.INVOKER_DESCRIPTOR, invoker.getId());
-	}
-
-	public String getName()
-	{
-		return Messages.getString("XSLProcessorTab.0"); //$NON-NLS-1$
-	}
-	
-	@Override
-	public String getId()
-	{
-		return "org.eclipse.wst.xsl.debug.ui.jaxp.tabs.processor";
-	}
-
-	@Override
-	public Image getImage()
-	{
-		if (image == null)
-		{
-			ImageDescriptor id = JAXPDebugUIPlugin.imageDescriptorFromPlugin(JAXPDebugUIPlugin.PLUGIN_ID, "icons/xslt_processor.gif");
-			image = id.createImage();
-		}
-		return image;
-	}
-
-	@Override
-	public void dispose()
-	{
-		if (image != null)
-			image.dispose();
-		super.dispose();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/messages.properties b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/messages.properties
deleted file mode 100644
index 1cebef7..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/tabs/processor/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-AttributesBlock.1=Change Preferences...
-AttributesBlock.10=type
-AttributesBlock.11=value
-AttributesBlock.12=value
-AttributesBlock.16=Processor Attributes
-AttributesBlock.3=Use specific attributes
-AttributesBlock.4=Attribute
-AttributesBlock.5=Type
-AttributesBlock.6=Value
-AttributesBlock.9=name
-XSLProcessorTab.0=Processor
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/views/ResultView.java b/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/views/ResultView.java
deleted file mode 100644
index 7c9f2d6..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.debug.ui/src/org/eclipse/wst/xsl/jaxp/debug/ui/internal/views/ResultView.java
+++ /dev/null
@@ -1,189 +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.jaxp.debug.ui.internal.views;
-
-import java.io.IOException;
-import java.io.Reader;
-
-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.DebugPlugin;
-import org.eclipse.debug.core.IDebugEventSetListener;
-import org.eclipse.debug.core.model.IDebugTarget;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin;
-import org.eclipse.wst.xsl.jaxp.launching.model.JAXPDebugTarget;
-import org.eclipse.wst.xsl.ui.internal.StructuredTextViewerConfigurationXSL;
-
-/**
- * TODO handle multiple concurrent debugging processes (and bring the current results to the top depending on which selected in Debug view)
- * 
- * @author Doug Satchwell
- */
-public class ResultView extends ViewPart implements IDebugEventSetListener
-{
-	private SourceViewer sv;
-
-	@Override
-	public void dispose()
-	{
-		DebugPlugin.getDefault().removeDebugEventListener(this);
-		super.dispose();
-	}
-
-	@Override
-	public void createPartControl(Composite parent)
-	{
-		this.sv = createViewer(parent);
-		
-		// handle any launches already added
-		IDebugTarget[] targets = DebugPlugin.getDefault().getLaunchManager().getDebugTargets();
-		for (IDebugTarget debugTarget : targets)
-		{
-			if (debugTarget instanceof JAXPDebugTarget)
-			{
-				handleDebugTarget((JAXPDebugTarget)debugTarget);
-			}			
-		}
-		// listen to further launches
-		DebugPlugin.getDefault().addDebugEventListener(this);
-	}
-
-	private SourceViewer createViewer(Composite parent)
-	{
-		SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
-			StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationXSL();
-
-			public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-				return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-			}
-
-			public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-				return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
-			}
-		};
-		SourceViewer viewer = new StructuredTextViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		((StructuredTextViewer) viewer).getTextWidget().setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
-		viewer.configure(sourceViewerConfiguration);
-		viewer.setEditable(false);
-		return viewer;
-	}
-
-	@Override
-	public void setFocus()
-	{}
-
-	public void handleDebugEvents(DebugEvent[] events)
-	{
-		for (DebugEvent debugEvent : events)
-		{
-			if (debugEvent.getKind() == DebugEvent.CREATE && debugEvent.getSource() instanceof JAXPDebugTarget)
-			{
-				handleDebugTarget((JAXPDebugTarget)debugEvent.getSource());
-			}
-		}
-	}
-	
-	private void handleDebugTarget(JAXPDebugTarget xdt)
-	{
-		// first, clear the viewer
-		sv.setDocument(null);
-		
-		final Reader reader = xdt.getGenerateReader();
-		IWorkbenchSiteProgressService service = (IWorkbenchSiteProgressService)getSite().getService(IWorkbenchSiteProgressService.class);
-		service.schedule(new Job("Result view job"){
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				IStatus status = Status.OK_STATUS;
-				try
-				{
-					char[] c = new char[8192]; // this is the default BufferedWriter size, so we will usually get chunks of this size
-					int size;
-					while((size = reader.read(c)) != -1)
-					{
-						writeString(new String(c,0,size));
-					}
-				}
-				catch (IOException e)
-				{
-					// ignore
-				}
-				finally
-				{
-					monitor.done();
-				}
-				return status;
-			}
-			
-			private void writeString(final String s)
-			{
-				getSite().getShell().getDisplay().syncExec(new Runnable(){
-
-					public void run()
-					{
-						// if this is the first lot of data, determine the correct content type and set the appropriate document
-						if (sv.getDocument()  == null)
-						{
-							IDocument document;
-							if (s.startsWith("<!DOCTYPE html"))
-							{
-								String contentType = "org.eclipse.wst.html.core.htmlsource";
-								IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentType);
-								document = scratchModel.getStructuredDocument();
-							}
-							else if (s.startsWith("<?xml"))
-							{
-								String contentType = "org.eclipse.core.runtime.xml";
-								IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentType);
-								document = scratchModel.getStructuredDocument();
-							}
-							else
-							{
-								// TODO how to create a plain text Document??
-								document = null;
-							}
-							sv.setDocument(document);
-						}
-						try
-						{
-							sv.getDocument().replace(sv.getDocument().getLength(), 0, s);
-						}
-						catch (BadLocationException e)
-						{
-							XSLDebugUIPlugin.log(e);
-						}
-						sv.revealRange(sv.getDocument().getLength(),0);
-						PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().activate(ResultView.this);
-					}
-				});
-			}
-		});
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/.classpath b/bundles/org.eclipse.wst.xsl.jaxp.launching/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/.project b/bundles/org.eclipse.wst.xsl.jaxp.launching/.project
deleted file mode 100644
index 8dea7ec..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.jaxp.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xsl.jaxp.launching/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index b8d9369..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Jul 30 16:38:51 BST 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.jaxp.launching/JREDefaultAttributes.properties b/bundles/org.eclipse.wst.xsl.jaxp.launching/JREDefaultAttributes.properties
deleted file mode 100644
index 9c244d2..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/JREDefaultAttributes.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.jaxp.launching/JREDefaultOutputProperties.properties b/bundles/org.eclipse.wst.xsl.jaxp.launching/JREDefaultOutputProperties.properties
deleted file mode 100644
index ad23e9d..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/JREDefaultOutputProperties.properties
+++ /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
-###############################################################################
-
-method=method
-method.DESC="xml" | "html" | "text" | qname-but-not-ncname 
-
-version=version
-version.DESC=specifies the version of the output method
-
-indent=indent
-indent.DESC=specifies whether the XSLT processor may add additional whitespace when outputting the result tree; the value must be yes or no
-
-encoding=encoding
-encoding.DESC=specifies the preferred character encoding that the XSLT processor should use to encode sequences of characters as sequences of bytes; the value of the attribute should be treated case-insensitively; the value must contain only characters in the range #x21 to #x7E (i.e. printable ASCII characters); the value should either be a charset registered with the Internet Assigned Numbers Authority [IANA], [RFC2278] or start with X-
-
-media-type=media-type
-media-type.DESC=specifies the media type (MIME content type) of the data that results from outputting the result tree; the charset parameter should not be specified explicitly; instead, when the top-level media type is text, a charset parameter should be added according to the character encoding actually used by the output method
-
-doctype-system=doctype-system
-doctype-system.DESC=specifies the system identifier to be used in the document type declaration
-
-doctype-public=doctype-public
-doctype-public.DESC=specifies the public identifier to be used in the document type declaration
-
-omit-xml-declaration=omit-xml-declaration
-omit-xml-declaration.DESC=specifies whether the XSLT processor should output an XML declaration; the value must be yes or no
-
-standalone=standalone
-standalone.DESC=specifies whether the XSLT processor should output a standalone document declaration; the value must be yes or no
-
-cdata-section-elements=cdata-section-elements
-cdata-section-elements.DESC=specifies a list of the names of elements whose text node children should be output using CDATA sections
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.jaxp.launching/META-INF/MANIFEST.MF
deleted file mode 100644
index 9669b44..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsl.jaxp.launching;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.xsl.jaxp.launching.internal.JAXPLaunchingPlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.variables;bundle-version="[3.2.100,4.0.0)",
- org.eclipse.debug.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.launching;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.xsl.jaxp.debug;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jface;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.wst.xsl.jaxp.launching,
- org.eclipse.wst.xsl.jaxp.launching.model
-Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/about.html b/bundles/org.eclipse.wst.xsl.jaxp.launching/about.html
deleted file mode 100644
index ed30003..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.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>August, 2008</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.jaxp.launching/build.properties b/bundles/org.eclipse.wst.xsl.jaxp.launching/build.properties
deleted file mode 100644
index cfc36a5..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               schema/,\
-               JREDefaultAttributes.properties,\
-               JREDefaultOutputProperties.properties,\
-               plugin.properties
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/log4j.debug.properties b/bundles/org.eclipse.wst.xsl.jaxp.launching/log4j.debug.properties
deleted file mode 100644
index 62dfb61..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/log4j.debug.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# Set root logger level to DEBUG and its appenders are A1 and A2
-log4j.rootLogger=ERROR, A2
-
-# A2 is set to be a ConsoleAppender
-log4j.appender.A2=org.apache.log4j.ConsoleAppender
-
-# A2 uses PatternLayout.
-log4j.appender.A2.layout=org.apache.log4j.PatternLayout
-log4j.appender.A2.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%t] %c{1} %x - %m%n
-
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/plugin.properties b/bundles/org.eclipse.wst.xsl.jaxp.launching/plugin.properties
deleted file mode 100644
index fcb4820..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/plugin.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = XSL JAXP Launching (Incubating)
-launchDelegate.name.0 = Java
-processorType.label.1 = JRE Default
-processor.label.1 = JRE Instance Default
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/plugin.xml b/bundles/org.eclipse.wst.xsl.jaxp.launching/plugin.xml
deleted file mode 100644
index 91e2643..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/plugin.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension-point id="debugger" name="debugger" schema="schema/debugger.exsd"/>
-   <extension-point id="invoke" name="invoke" schema="schema/invoke.exsd"/>
-   <extension-point id="processor" name="processor" schema="schema/processor.exsd"/>
-   <extension-point id="processorType" name="processorType" schema="schema/processorType.exsd"/>
- <extension
-       point="org.eclipse.debug.core.launchDelegates">
-    <launchDelegate
-          delegate="org.eclipse.wst.xsl.jaxp.launching.internal.JAXPJavaLaunchConfigurationDelegate"
-          delegateDescription="The XSLT Launcher for JAXP supports running and debugging transformations using JAXP-compliant XSLT processors"
-          id="org.eclipse.wst.xsl.launching.internal.jaxp.JAXPLaunchConfigurationDelegate"
-          modes="run, debug"
-          name="%launchDelegate.name.0"
-          type="org.eclipse.wst.xsl.launching.launchConfigurationType">
-    </launchDelegate>    
- </extension>
-     	
-	<extension point="org.eclipse.core.runtime.preferences">
-		<initializer
-			class="org.eclipse.wst.xsl.jaxp.launching.internal.PreferenceInitializer">
-		</initializer>
-	</extension>
- 
-	<extension point="org.eclipse.wst.xsl.jaxp.launching.invoke">
-		<invoker id="org.eclipse.wst.xsl.launching.jaxp.invoke"
-			class="org.eclipse.wst.xsl.jaxp.debug.invoker.internal.JAXPSAXProcessorInvoker"
-			classpath="${eclipse_orbit:org.eclipse.wst.xsl.jaxp.debug};${eclipse_orbit:org.apache.commons.logging};${eclipse_orbit:org.apache.log4j}" />
-	</extension>
-
-  	<extension
-	       point="org.eclipse.wst.xsl.jaxp.launching.processorType">
-     <processorType
-            attributeProperties="JREDefaultAttributes.properties"
-            id="org.eclipse.wst.xsl.launching.processorType.jreDefault"
-            label="%processorType.label.1"
-            outputProperties="JREDefaultOutputProperties.properties" />
-	 </extension>
-
-	<extension
-	         point="org.eclipse.wst.xsl.jaxp.launching.processor">
-        <processor
-              classpath=""
-              id="org.eclipse.wst.xsl.launching.jre.default"
-              label="%processor.label.1"
-              processorTypeId="org.eclipse.wst.xsl.launching.processorType.jreDefault"
-              supports="1.0"/>
-	 </extension>
- 
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/schema/debugger.exsd b/bundles/org.eclipse.wst.xsl.jaxp.launching/schema/debugger.exsd
deleted file mode 100644
index ef80f04..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/schema/debugger.exsd
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.xsl.launching.jaxp" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.wst.xsl.launching.jaxp" id="debugger" name="XSLT Debugger"/>
-      </appinfo>
-      <documentation>
-         Contribute a debugger for a particular JAXP processor type (e.g. Saxon). The extension point primarily defines the classpath and transformer factory to be used when debugging.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <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">
-      <annotation>
-         <documentation>
-            A debugger for a processor type
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique id for this debugger
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A name to be displayed in the UI
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="classpath" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A &apos;;&apos;-separated classpath required to run the debugger (in addition to that already added by the processor itself).
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="processorTypeId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The processor type that this debugger works with
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="className" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A fully-qualified class that implement the IXSLDebugger interface. It is easier to extend AbstractXSLDebugger.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.wst.xsl.jaxp.debug.debugger.IXSLDebugger"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="transformerFactoryClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully-qualified class name of the transformer factory to use for debugging. This must be one of the transformer factories belonging to the processor type.
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn="javax.xml.transform.TransformerFactory:"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         &lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.xsl.jaxp.launching.debugger&quot;&gt;
-      &lt;debugger
-            className=&quot;org.eclipse.wst.xsl.xalan.debugger.XalanDebugger&quot;
-            classpath=&quot;${eclipse_orbit:org.eclipse.wst.xsl.xalan}&quot;
-            id=&quot;org.eclipse.wst.xsl.xalan.debugger&quot;
-            name=&quot;Xalan 2.5.1 or greater&quot;
-            processorTypeId=&quot;org.eclipse.wst.xsl.xalan.processorType&quot;
-            transformerFactoryClass=&quot;org.apache.xalan.processor.TransformerFactoryImpl&quot;&gt;
-      &lt;/debugger&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </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.jaxp.launching/schema/invoke.exsd b/bundles/org.eclipse.wst.xsl.jaxp.launching/schema/invoke.exsd
deleted file mode 100644
index 8f0c1f2..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/schema/invoke.exsd
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.xsl.launching.jaxp" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.wst.xsl.launching.jaxp" 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">
-      <annotation>
-         <appinfo>
-            <meta.element internal="true" />
-         </appinfo>
-      </annotation>
-      <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="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.jaxp.launching/schema/processor.exsd b/bundles/org.eclipse.wst.xsl.jaxp.launching/schema/processor.exsd
deleted file mode 100644
index e59e08c..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/schema/processor.exsd
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.xsl.launching.jaxp" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.wst.xsl.launching.jaxp" 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">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <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>
-         <documentation>
-            An instance of a JAXP-compliant XSLT processor
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique id for this processor instance
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A label for this instance to be displayed in the UI
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="processorTypeId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The id for the processor type
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="classpath" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The classpath to use when this processor is launched
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="debuggerId" type="string">
-            <annotation>
-               <documentation>
-                  The id of a debugger to associate with the processor
-               </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="examples"/>
-      </appinfo>
-      <documentation>
-         &lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.xsl.jaxp.launching.processor&quot;&gt;
-      &lt;!-- An adopter can specify the ${eclipse_orbit: } variable to indicate which eclipse
-           bundle should be added to the class path. --&gt;
-      &lt;processor
-      classpath=&quot;${eclipse_orbit:org.apache.xalan};${eclipse_orbit:org.apache.xml.serializer};${eclipse_orbit:org.apache.bcel};${eclipse_orbit:java_cup.runtime}&quot;
-            id=&quot;org.eclipse.wst.xsl.launching.xalan.processor&quot;
-            label=&quot;%processor.label.1&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="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.jaxp.launching/schema/processorType.exsd b/bundles/org.eclipse.wst.xsl.jaxp.launching/schema/processorType.exsd
deleted file mode 100644
index eaada5f..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/schema/processorType.exsd
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.xsl.launching.jaxp" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.wst.xsl.launching.jaxp" id="processorType" name="XSLT Processor Type"/>
-      </appinfo>
-      <documentation>
-         Contribute a Java XSLT processor type (e.g. Xalan, Saxon). The processor type defines which JAXP attributes and output properies are supported, and also the transformer factory classes it contains.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <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>
-         <sequence>
-            <element ref="transformerFactory" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <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="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="attributeProperties" type="string">
-            <annotation>
-               <documentation>
-                  Location of a properties file containing the list of the attributes supported by this processor. Must be a path relative to the root of the bundle.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="transformerFactory">
-      <annotation>
-         <documentation>
-            A TransformerFactory for this type
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="factoryClass" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The fully-qualified transformer factory class
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn="javax.xml.transform.TransformerFactory:"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A name for this transformer factory to be displayed in the UI
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         &lt;pre&gt;
-   &lt;extension
-         point=&quot;org.eclipse.wst.xsl.jaxp.launching.processorType&quot;&gt;
-      &lt;processorType
-            attributeProperties=&quot;XalanAttributes.properties&quot;
-            id=&quot;org.eclipse.wst.xsl.xalan.processorType&quot;
-            label=&quot;%processorType.label.0&quot;
-            outputProperties=&quot;XalanOutputProperties.properties&quot;&gt;
-         &lt;transformerFactory
-               factoryClass=&quot;org.apache.xalan.processor.TransformerFactoryImpl&quot;
-               name=&quot;Interpretive&quot;&gt;
-         &lt;/transformerFactory&gt;
-         &lt;transformerFactory
-               factoryClass=&quot;org.apache.xalan.xsltc.trax.TransformerFactoryImpl&quot;
-               name=&quot;Compiling&quot;&gt;
-         &lt;/transformerFactory&gt;
-      &lt;/processorType&gt;
-   &lt;/extension&gt;
-&lt;/pre&gt;
-      </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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IAttribute.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IAttribute.java
deleted file mode 100644
index 467914b..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IAttribute.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.jaxp.launching;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * A attribute supported by an XSLT processor. 
- * 
- * @author Doug Satchwell
- */
-public interface IAttribute
-{
-	/**
-	 * Constant for attributes of type <code>string</code>
-	 * @see #getType()
-	 */
-	String TYPE_STRING = "string"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for attributes of type <code>boolean</code>
-	 * @see #getType()
-	 */
-	String TYPE_BOOLEAN = "boolean"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for attributes of type <code>int</code>
-	 * @see #getType()
-	 */
-	String TYPE_INT = "int"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for attributes of type <code>double</code>
-	 * @see #getType()
-	 */
-	String TYPE_DOUBLE = "double"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for attributes of type <code>float</code>
-	 * @see #getType()
-	 */
-	String TYPE_FLOAT = "float"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for attributes of type <code>class</code>
-	 * @see #getType()
-	 */
-	String TYPE_CLASS = "class"; //$NON-NLS-1$
-	
-	/**
-	 * Constant for attributes of type <code>object</code>
-	 * @see #getType()
-	 */
-	String TYPE_OBJECT = "object"; //$NON-NLS-1$
-
-	/**
-	 * Get the URI for this attribute
-	 * @return the attribute URI
-	 */
-	String getURI();
-
-	/**
-	 * Get a description for this attribute
-	 * @return the attribute description
-	 */
-	String getDescription();
-
-	/**
-	 * Get the type of this attribute. Will match one of the TYPE constants in this interface.
-	 * @return the attribute 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 attribute.
-	 * @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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IDebugger.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IDebugger.java
deleted file mode 100644
index 5502f95..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IDebugger.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.jaxp.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();
-	
-	/**
-	 * Get the transformer factory this debugger is associated with
-	 * @return the transformer factory
-	 */
-	String getTransformerFactory();
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IOutputProperty.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IOutputProperty.java
deleted file mode 100644
index 9bd2c76..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/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.jaxp.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IProcessorInstall.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IProcessorInstall.java
deleted file mode 100644
index 4cab27b..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/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.jaxp.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IProcessorInvoker.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IProcessorInvoker.java
deleted file mode 100644
index 540101a..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/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.jaxp.launching;
-
-public interface IProcessorInvoker
-{
-	String getId();
-
-	String getInvokerClassName();
-
-	String[] getClasspathEntries();
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IProcessorJar.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IProcessorJar.java
deleted file mode 100644
index 53052bb..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/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.jaxp.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IProcessorType.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IProcessorType.java
deleted file mode 100644
index d13e700..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/IProcessorType.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.jaxp.launching;
-
-import java.util.Map;
-
-/**
- * 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();
-
-	ITransformerFactory[] getTransformerFactories();
-
-	IAttribute[] getAttributes();
-
-	Map<String, String> getAttributeValues();
-
-	IOutputProperty[] getOutputProperties();
-
-	Map<String, String> getOutputPropertyValues();
-
-	ITransformerFactory getDefaultTransformerFactory();
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/ITransformerFactory.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/ITransformerFactory.java
deleted file mode 100644
index 64716ab..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/ITransformerFactory.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.launching;
-
-public interface ITransformerFactory
-{
-	String getName();
-	String getFactoryClass();
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/JAXPLaunchConfigurationConstants.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/JAXPLaunchConfigurationConstants.java
deleted file mode 100644
index a1cf82d..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/JAXPLaunchConfigurationConstants.java
+++ /dev/null
@@ -1,28 +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.jaxp.launching;
-
-import org.eclipse.wst.xsl.jaxp.launching.internal.JAXPLaunchingPlugin;
-
-public class JAXPLaunchConfigurationConstants
-{
-	public static final String INVOKER_DESCRIPTOR = JAXPLaunchingPlugin.PLUGIN_ID + ".INVOKER_DESCRIPTOR"; //$NON-NLS-1$
-	public static final String ATTR_PROCESSOR = JAXPLaunchingPlugin.PLUGIN_ID + ".ATTR_PROCESSOR"; //$NON-NLS-1$	
-	public static final String ATTR_OUTPUT_PROPERTIES = JAXPLaunchingPlugin.PLUGIN_ID + ".ATTR_OUTPUT_PROPERTIES"; //$NON-NLS-1$
-	public static final String ATTR_ATTRIBUTES = JAXPLaunchingPlugin.PLUGIN_ID + ".ATTR_ATTRIBUTES"; //$NON-NLS-1$
-	public static final String ATTR_DEFAULT_DEBUGGING_INSTALL_ID = JAXPLaunchingPlugin.PLUGIN_ID + ".ATTR_DEFAULT_DEBUGGING_INSTALL_ID"; //$NON-NLS-1$
-	public static final String ATTR_USE_DEFAULT_PROCESSOR = JAXPLaunchingPlugin.PLUGIN_ID + ".ATTR_USE_DEFAULT_PROCESSOR"; //$NON-NLS-1$
-	public static final String ATTR_TRANSFORMER_FACTORY = JAXPLaunchingPlugin.PLUGIN_ID + ".ATTR_TRANSFORMER_FACTORY";
-
-	public static final String XALAN_TYPE_ID = "org.eclipse.wst.xsl.xalan.processorType"; //$NON-NLS-1$
-	public static final String SAXON_TYPE_ID = "org.eclipse.wst.xsl.saxon.processorType"; //$NON-NLS-1$
-	public static final String SAXON_1_0_TYPE_ID = "org.eclipse.wst.xsl.saxon_1_0.processorType"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/JAXPRuntime.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/JAXPRuntime.java
deleted file mode 100644
index ba1dd11..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/JAXPRuntime.java
+++ /dev/null
@@ -1,330 +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.jaxp.launching;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.xsl.jaxp.launching.internal.FeaturePreferences;
-import org.eclipse.wst.xsl.jaxp.launching.internal.JAXPLaunchingPlugin;
-import org.eclipse.wst.xsl.jaxp.launching.internal.OutputPropertyPreferences;
-import org.eclipse.wst.xsl.jaxp.launching.internal.ProcessorJar;
-import org.eclipse.wst.xsl.jaxp.launching.internal.ProcessorPreferences;
-import org.eclipse.wst.xsl.jaxp.launching.internal.registry.DebuggerRegistry;
-import org.eclipse.wst.xsl.jaxp.launching.internal.registry.InvokerRegistry;
-import org.eclipse.wst.xsl.jaxp.launching.internal.registry.ProcessorRegistry;
-import org.eclipse.wst.xsl.jaxp.launching.internal.registry.ProcessorTypeRegistry;
-
-public class JAXPRuntime
-{
-	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()
-	{
-		JAXPLaunchingPlugin.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 = JAXPRuntime.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 JAXPLaunchingPlugin.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;
-			JAXPRuntime.getPreferences().setValue(JAXPRuntime.PREF_FEATURE_XML, xml);
-			monitor.worked(30);
-			if (monitor.isCanceled())
-				return;
-			JAXPRuntime.savePreferences();
-			monitor.worked(30);
-		}
-		catch (Exception e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR,JAXPLaunchingPlugin.PLUGIN_ID,Messages.getString("XSLTRuntime.6"),e)); //$NON-NLS-1$
-		}
-		finally
-		{
-			monitor.done();
-		}
-	}
-
-	public static void saveOutputPropertyPreferences(Map<IProcessorType, Map<String,String>> 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;
-			JAXPRuntime.getPreferences().setValue(JAXPRuntime.PREF_OUTPUT_PROPERTIES_XML, xml);
-			monitor.worked(30);
-			if (monitor.isCanceled())
-				return;
-			JAXPRuntime.savePreferences();
-			monitor.worked(30);
-		}
-		catch (Exception e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR,JAXPLaunchingPlugin.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;
-			JAXPRuntime.getPreferences().setValue(JAXPRuntime.PREF_PROCESSOR_XML, xml);
-			monitor.worked(30);
-			if (monitor.isCanceled())
-				return;
-			JAXPRuntime.savePreferences();
-			monitor.worked(30);
-		}
-		catch (Exception e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR,JAXPLaunchingPlugin.PLUGIN_ID,Messages.getString("XSLTRuntime.10"),e)); //$NON-NLS-1$
-		}
-		finally
-		{
-			monitor.done();
-		}
-	}
-
-	public static Map<String,String> createDefaultOutputProperties(String typeId)
-	{
-		Map<String,String> props = new HashMap<String,String>();
-		if (JRE_DEFAULT_PROCESSOR_TYPE_ID.equals(typeId))
-			props.put("indent", "yes"); //$NON-NLS-1$ //$NON-NLS-2$
-		else if (JAXPLaunchConfigurationConstants.XALAN_TYPE_ID.equals(typeId))
-		{
-			props.put("indent", "yes"); //$NON-NLS-1$ //$NON-NLS-2$
-			props.put("{http://xml.apache.org/xslt}indent-amount", "4"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		else if (JAXPLaunchConfigurationConstants.SAXON_TYPE_ID.equals(typeId))
-		{
-			props.put("indent", "yes"); //$NON-NLS-1$ //$NON-NLS-2$
-			props.put("{http://saxon.sf.net/}indent-spaces", "4"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		else if (JAXPLaunchConfigurationConstants.SAXON_1_0_TYPE_ID.equals(typeId))
-		{
-			props.put("indent", "yes"); //$NON-NLS-1$ //$NON-NLS-2$
-			props.put("{http://saxon.sf.net/}indent-spaces", "4"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return props;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/LaunchAttributes.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/LaunchAttributes.java
deleted file mode 100644
index a23335b..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/LaunchAttributes.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.jaxp.launching;
-
-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.launching.config.LaunchAttribute;
-import org.eclipse.wst.xsl.launching.config.PreferenceUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class LaunchAttributes
-{
-	private final Set<LaunchAttribute> attributes = new HashSet<LaunchAttribute>();
-
-	public Set<LaunchAttribute> getAttributes()
-	{
-		return attributes;
-	}
-
-	public void addAttribute(LaunchAttribute attribute)
-	{
-		attributes.add(attribute);
-	}
-
-	public LaunchAttribute getAttribute(String uri)
-	{
-		for (Iterator<LaunchAttribute> iter = attributes.iterator(); iter.hasNext();)
-		{
-			LaunchAttribute tv = (LaunchAttribute) iter.next();
-			if (tv.uri.equals(uri))
-				return tv;
-		}
-		return null;
-	}
-
-	public void removeAtribute(String uri)
-	{
-		for (Iterator<LaunchAttribute> iter = attributes.iterator(); iter.hasNext();)
-		{
-			LaunchAttribute attribute = (LaunchAttribute) iter.next();
-			if (attribute.uri.equals(uri))
-				iter.remove();
-		}
-	}
-
-	public String toXML() throws ParserConfigurationException, IOException, TransformerException
-	{
-		Document doc = PreferenceUtil.getDocument();
-
-		Element attributesEl = doc.createElement("Attributes"); //$NON-NLS-1$
-		doc.appendChild(attributesEl);
-
-		for (Iterator<LaunchAttribute> iter = attributes.iterator(); iter.hasNext();)
-		{
-			LaunchAttribute attribute = (LaunchAttribute) iter.next();
-			Element attributeEl = doc.createElement("Attribute"); //$NON-NLS-1$
-			attributeEl.setAttribute("name", attribute.uri); //$NON-NLS-1$
-			attributeEl.setAttribute("type", attribute.type); //$NON-NLS-1$
-			attributeEl.setAttribute("value", attribute.value); //$NON-NLS-1$
-			attributesEl.appendChild(attributeEl);
-		}
-
-		return PreferenceUtil.serializeDocument(doc);
-	}
-
-	public static LaunchAttributes fromXML(InputStream inputStream) throws CoreException
-	{
-		Document doc = PreferenceUtil.getDocument(inputStream);
-
-		LaunchAttributes pdef = new LaunchAttributes();
-
-		Element attributesEl = doc.getDocumentElement();
-
-		NodeList attributeEls = attributesEl.getElementsByTagName("Attribute"); //$NON-NLS-1$
-		for (int i = 0; i < attributeEls.getLength(); i++)
-		{
-			Element attributeEl = (Element) attributeEls.item(i);
-			String name = attributeEl.getAttribute("name"); //$NON-NLS-1$
-			String type = attributeEl.getAttribute("type"); //$NON-NLS-1$
-			String value = attributeEl.getAttribute("value"); //$NON-NLS-1$
-			pdef.addAttribute(new LaunchAttribute(name, type, value));
-		}
-
-		return pdef;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/LaunchProperties.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/LaunchProperties.java
deleted file mode 100644
index d999eb1..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/LaunchProperties.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.jaxp.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.eclipse.wst.xsl.launching.config.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 propertysEl = doc.createElement("Properties"); //$NON-NLS-1$
-		doc.appendChild(propertysEl);
-
-		for (Map.Entry<String, String> property : properties.entrySet())
-		{
-			String name = property.getKey();
-			String value = property.getValue();
-			Element propertyEl = doc.createElement("Property"); //$NON-NLS-1$
-			propertyEl.setAttribute("name", name); //$NON-NLS-1$
-			propertyEl.setAttribute("value", value); //$NON-NLS-1$
-			propertysEl.appendChild(propertyEl);
-		}
-
-		return PreferenceUtil.serializeDocument(doc);
-	}
-
-	public static LaunchProperties fromXML(InputStream inputStream) throws CoreException
-	{
-		Document doc = PreferenceUtil.getDocument(inputStream);
-
-		LaunchProperties pdef = new LaunchProperties();
-
-		Element propertysEl = doc.getDocumentElement();
-
-		NodeList propertyEls = propertysEl.getElementsByTagName("Property"); //$NON-NLS-1$
-		for (int i = 0; i < propertyEls.getLength(); i++)
-		{
-			Element propertyEl = (Element) propertyEls.item(i);
-			String name = propertyEl.getAttribute("name"); //$NON-NLS-1$
-			String value = propertyEl.getAttribute("value"); //$NON-NLS-1$
-			pdef.setProperty(name, value);
-		}
-
-		return pdef;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/Messages.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/Messages.java
deleted file mode 100644
index d454fb5..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.launching;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.jaxp.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/ProcessorInstall.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/ProcessorInstall.java
deleted file mode 100644
index 6ee8717..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/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.jaxp.launching;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.xsl.jaxp.launching.internal.JAXPLaunchingPlugin;
-import org.eclipse.wst.xsl.jaxp.launching.internal.PluginProcessorJar;
-import org.eclipse.wst.xsl.jaxp.launching.internal.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 JAXPRuntime.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)
-			{
-				JAXPLaunchingPlugin.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 JAXPRuntime.getDebugger(debuggerId);
-	}
-
-	public void setDebuggerId(String debuggerId)
-	{
-		this.debuggerId = debuggerId;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/Attribute.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/Attribute.java
deleted file mode 100644
index 7be3541..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/Attribute.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.jaxp.launching.internal;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.xsl.jaxp.launching.IAttribute;
-
-public class Attribute implements IAttribute, Comparable<Object>
-{
-	private final String uri;
-	private final String description;
-	private final String type;
-
-	public Attribute(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, JAXPLaunchingPlugin.PLUGIN_ID, 0, Messages.getString("Attribute.2"), null); //$NON-NLS-1$
-		}
-		else if (TYPE_INT.equals(type))
-		{
-			try
-			{
-				Integer.parseInt(value);
-			}
-			catch (NumberFormatException e)
-			{
-				status = new Status(IStatus.ERROR, JAXPLaunchingPlugin.PLUGIN_ID, 0, Messages.getString("Attribute.1"), null); //$NON-NLS-1$
-			}
-		}
-		else if (TYPE_DOUBLE.equals(type))
-		{
-			try
-			{
-				Double.parseDouble(value);
-			}
-			catch (NumberFormatException e)
-			{
-				status = new Status(IStatus.ERROR, JAXPLaunchingPlugin.PLUGIN_ID, 0, Messages.getString("Attribute.0"), null); //$NON-NLS-1$
-			}
-		}
-		else if (TYPE_FLOAT.equals(type))
-		{
-			try
-			{
-				Float.parseFloat(value);
-			}
-			catch (NumberFormatException e)
-			{
-				status = new Status(IStatus.ERROR, JAXPLaunchingPlugin.PLUGIN_ID, 0, Messages.getString("Attribute.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 IAttribute)
-		{
-			IAttribute f = (IAttribute) o;
-			return f.getURI().compareTo(getURI());
-		}
-		return 0;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/DebuggerDescriptor.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/DebuggerDescriptor.java
deleted file mode 100644
index 421dc71..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/DebuggerDescriptor.java
+++ /dev/null
@@ -1,67 +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.jaxp.launching.internal;
-
-import org.eclipse.wst.xsl.jaxp.launching.IDebugger;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-
-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;
-	private final String transformerFactory;
-
-	public DebuggerDescriptor(String id, String bundleId, String className, String[] classpath, String name, String processorTypeId, String transformerFactory)
-	{
-		this.id = id;
-		this.classpath = classpath;
-		this.bundleId = bundleId;
-		this.name = name;
-		this.processorTypeId = processorTypeId;
-		this.className = className;
-		this.transformerFactory = transformerFactory;
-	}
-
-	public String getClassName()
-	{
-		return className;
-	}
-
-	public String[] getClassPath()
-	{
-		return ProcessorInvokerDescriptor.createEntries(bundleId, classpath);
-	}
-
-	public String getId()
-	{
-		return id;
-	}
-
-	public String getName()
-	{
-		return name;
-	}
-
-	public IProcessorType getProcessorType()
-	{
-		return JAXPRuntime.getProcessorType(processorTypeId);
-	}
-
-	public String getTransformerFactory()
-	{
-		return transformerFactory;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/FeaturePreferences.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/FeaturePreferences.java
deleted file mode 100644
index 0a17c5f..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/FeaturePreferences.java
+++ /dev/null
@@ -1,122 +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.jaxp.launching.internal;
-
-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.eclipse.wst.xsl.launching.config.PreferenceUtil;
-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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/JAXPJavaLaunchConfigurationDelegate.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/JAXPJavaLaunchConfigurationDelegate.java
deleted file mode 100644
index 30df999..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/JAXPJavaLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,441 +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.jaxp.launching.internal;
-
-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.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-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.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsl.jaxp.launching.IDebugger;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorInvoker;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorJar;
-import org.eclipse.wst.xsl.jaxp.launching.ITransformerFactory;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-import org.eclipse.wst.xsl.jaxp.launching.model.JAXPDebugTarget;
-import org.eclipse.wst.xsl.launching.model.IXSLConstants;
-
-public class JAXPJavaLaunchConfigurationDelegate extends JavaLaunchDelegate implements IDebugEventSetListener
-{
-	private String mode;
-	LaunchHelper launchHelper;
-	
-	@Override
-	public synchronized void launch(ILaunchConfiguration configuration, final String mode, final ILaunch launch, IProgressMonitor monitor) throws CoreException
-	{
-		this.mode = mode;
-		launchHelper.save(getLaunchConfigFile());
-		
-		// set the launch name
-		IProcessorInstall install = getProcessorInstall(configuration, mode);
-		String tfactory = getTransformerFactory(install);
-		String name = install.getName();
-		if (tfactory != null)
-			name += "[" + tfactory + "]";
-		launch.setAttribute("launchName", name);
-
-		// 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 JAXPDebugTarget(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
-	{
-		this.launchHelper = new LaunchHelper(configuration);
-		if (mode.equals(ILaunchManager.DEBUG_MODE))
-		{
-			// TODO don't like having UI code in the launching plugin...where else can it go?
-			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 = JAXPLaunchingPlugin.getDefault().getPluginPreferences().getString(JAXPLaunchConfigurationConstants.ATTR_DEFAULT_DEBUGGING_INSTALL_ID);
-						IProcessorInstall processor = JAXPRuntime.getProcessor(debuggingInstallId);
-
-						IWorkbenchWindow dw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-						
-						String title = Messages.getString("XSLTLaunchConfigurationDelegate.0"); //$NON-NLS-1$
-						String message = Messages.getString("XSLTLaunchConfigurationDelegate.1") + install.getName() + Messages.getString("XSLTLaunchConfigurationDelegate.2") //$NON-NLS-1$ //$NON-NLS-2$
-								+ Messages.getString("XSLTLaunchConfigurationDelegate.3") + processor.getName() + Messages.getString("XSLTLaunchConfigurationDelegate.4");//$NON-NLS-1$ //$NON-NLS-2$
-						
-						MessageDialog dialog = new MessageDialog(dw.getShell(), title, null, message, MessageDialog.QUESTION,
-								new String[] { IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL }, 0); // yes is the default
-						
-				        result[0] = dialog.open() == 0;
-					}
-				});
-				return result[0];
-			}
-			else
-			{
-				String debuggerTF = install.getDebugger().getTransformerFactory();
-				String installTF = launchHelper.getTransformerFactory() == null ? null : launchHelper.getTransformerFactory().getFactoryClass();
-				if (!debuggerTF.equals(installTF))
-				{
-					PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable()
-					{
-						public void run()
-						{
-							IWorkbenchWindow dw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-							
-							String title = Messages.getString("Change Transformer Factory");
-							String message = install.getName() + " must use the " + launchHelper.getTransformerFactory().getName() + " transformer factory when debugging.\n"
-									+ "Be aware that this may give different results to the " + launchHelper.getTransformerFactory().getName() + " transformer factory configured for this launch configuration.";
-							
-							MessageDialog dialog = new MessageDialog(dw.getShell(), title, null, message, MessageDialog.WARNING,
-									new String[] { IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL }, 0); // yes is the default
-							dialog.open();
-						}
-					});
-				}
-			}
-		}
-		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(JAXPLaunchingPlugin.getDefault().getBundle()).append("launch"); //$NON-NLS-1$
-		File launchDir = launchPath.toFile();
-		if (!launchDir.exists())
-			launchDir.mkdir();
-		File file = new File(launchDir, "launch.xml"); //$NON-NLS-1$
-		return file;
-	}
-
-	@Override
-	public IPath getWorkingDirectoryPath(ILaunchConfiguration configuration) throws CoreException
-	{
-		// TODO changes are afoot so that working directory can be gotten from the Common launch tab
-		
-//		String path = configuration.getAttribute(JAXPLaunchConfigurationConstants.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(JAXPLaunchConfigurationConstants.INVOKER_DESCRIPTOR, "org.eclipse.wst.xsl.launching.jaxp.invoke");
-		return JAXPRuntime.getProcessorInvoker(invokerId);
-	}
-
-	public static IProcessorInstall getProcessorInstall(ILaunchConfiguration configuration, String mode) throws CoreException
-	{
-		IProcessorInstall install = LaunchHelper.getProcessorInstall(configuration);
-		if (mode.equals(ILaunchManager.DEBUG_MODE) && install.getDebugger() == null)
-		{
-			String debuggingInstallId = JAXPLaunchingPlugin.getDefault().getPluginPreferences().getString(JAXPLaunchConfigurationConstants.ATTR_DEFAULT_DEBUGGING_INSTALL_ID);
-			install = JAXPRuntime.getProcessor(debuggingInstallId);
-		}
-		return install;
-	}
-
-	@Override
-	public String getMainTypeName(ILaunchConfiguration configuration) throws CoreException
-	{
-		if (ILaunchManager.DEBUG_MODE.equals(mode))
-			return "org.eclipse.wst.xsl.jaxp.debug.debugger.DebugRunner"; //$NON-NLS-1$
-		return "org.eclipse.wst.xsl.jaxp.debug.invoker.internal.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());
-				sb.append(" ").append(launchHelper.getEventPort()); //$NON-NLS-1$
-				sb.append(" ").append(launchHelper.getGeneratePort()); //$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, JAXPLaunchingPlugin.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 = getTransformerFactory(install);
-			if (tfactory != null)
-				vmargs += " -Djavax.xml.transform.TransformerFactory=" + tfactory; //$NON-NLS-1$
-			
-//			if (ILaunchManager.DEBUG_MODE.equals(mode))
-//			{
-//				// in debug mode, set the logging to ERROR. This prevents the console from popping up on top of the result view!
-//				try
-//				{
-//					URL url = FileLocator.resolve(FileLocator.find(Platform.getBundle(JAXPLaunchingPlugin.PLUGIN_ID), new Path("/log4j.debug.properties"), null));
-//					vmargs += " -Dlog4j.configuration=\""+url.toExternalForm()+"\""; //$NON-NLS-1$
-//				}
-//				catch (IOException e)
-//				{
-//					JAXPLaunchingPlugin.log(e);
-//				}
-//			}
-		}
-		return vmargs;
-	}
-	
-	private String getTransformerFactory(IProcessorInstall install)
-	{
-		String tfactory = null;
-		if (ILaunchManager.DEBUG_MODE.equals(mode))
-			tfactory = install.getDebugger().getTransformerFactory();
-		else
-		{
-			ITransformerFactory t = launchHelper.getTransformerFactory();
-			if (t != null)
-				tfactory = t.getFactoryClass();
-		}
-		return tfactory;
-	}
-
-	private File getEndorsedDir()
-	{
-		IPath tempLocation = Platform.getStateLocation(JAXPLaunchingPlugin.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, JAXPLaunchingPlugin.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)
-				{
-					JAXPLaunchingPlugin.log(e);
-				}
-			}
-			if (bos != null)
-			{
-				try
-				{
-					bos.close();
-				}
-				catch (IOException e)
-				{
-					JAXPLaunchingPlugin.log(e);
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/JAXPLaunchingPlugin.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/JAXPLaunchingPlugin.java
deleted file mode 100644
index 17ddda7..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/JAXPLaunchingPlugin.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.launching.internal;
-
-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 JAXPLaunchingPlugin extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.xsl.jaxp.launching";
-
-	// The shared instance
-	private static JAXPLaunchingPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public JAXPLaunchingPlugin() {
-	}
-
-	/*
-	 * (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 JAXPLaunchingPlugin 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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/LaunchHelper.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/LaunchHelper.java
deleted file mode 100644
index 71bf3b1..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/LaunchHelper.java
+++ /dev/null
@@ -1,245 +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.jaxp.launching.internal;
-
-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.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.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.wst.xsl.jaxp.debug.invoker.PipelineDefinition;
-import org.eclipse.wst.xsl.jaxp.debug.invoker.TransformDefinition;
-import org.eclipse.wst.xsl.jaxp.debug.invoker.TypedValue;
-import org.eclipse.wst.xsl.jaxp.launching.IAttribute;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.ITransformerFactory;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-import org.eclipse.wst.xsl.jaxp.launching.LaunchAttributes;
-import org.eclipse.wst.xsl.jaxp.launching.LaunchProperties;
-import org.eclipse.wst.xsl.launching.config.BaseLaunchHelper;
-import org.eclipse.wst.xsl.launching.config.LaunchAttribute;
-import org.eclipse.wst.xsl.launching.config.LaunchTransform;
-import org.eclipse.wst.xsl.launching.config.Messages;
-import org.eclipse.wst.xsl.launching.config.PreferenceUtil;
-import org.w3c.dom.Document;
-
-public class LaunchHelper extends BaseLaunchHelper
-{
-	private final LaunchAttributes attributes;
-	private final LaunchProperties outputProperties;
-	private final ITransformerFactory transformerFactory;
-
-	public LaunchHelper(ILaunchConfiguration configuration) throws CoreException
-	{
-		super(configuration);
-		attributes = hydrateAttributes(configuration);
-		outputProperties = hydrateOutputProperties(configuration);
-		transformerFactory = hydrateTransformerFactory(configuration);
-	}
-
-	public LaunchProperties getProperties()
-	{
-		return outputProperties;
-	}
-
-	public LaunchAttributes getAttributes()
-	{
-		return attributes;
-	}
-
-	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 = attributes.getAttributes().iterator(); iter.hasNext();)
-			{
-				LaunchAttribute att = (LaunchAttribute) iter.next();
-				pdef.addAttribute(new TypedValue(att.uri, TypedValue.TYPE_STRING, 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, TypedValue.TYPE_STRING, att.getResolvedValue()));
-				}
-				// set the output props for the LAST transform only
-				if (!iter.hasNext())
-				{
-					for (Map.Entry<String, String> entry : outputProperties.getProperties().entrySet())
-					{
-						String name = entry.getKey();
-						String value = 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, JAXPLaunchingPlugin.PLUGIN_ID, IStatus.ERROR, Messages.getString("LaunchHelper.0"), e)); //$NON-NLS-1$
-		}
-		catch (IOException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, JAXPLaunchingPlugin.PLUGIN_ID, IStatus.ERROR, Messages.getString("LaunchHelper.1"), e)); //$NON-NLS-1$
-		}
-		catch (ParserConfigurationException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, JAXPLaunchingPlugin.PLUGIN_ID, IStatus.ERROR, "ParserConfigurationException", e)); //$NON-NLS-1$
-		}
-		catch (TransformerException e)
-		{
-			throw new CoreException(new Status(IStatus.ERROR, JAXPLaunchingPlugin.PLUGIN_ID, IStatus.ERROR, "TransformerException", e)); //$NON-NLS-1$
-		}
-		finally
-		{
-			if (writer != null)
-			{
-				try
-				{
-					writer.close();
-				}
-				catch (IOException e)
-				{
-					JAXPLaunchingPlugin.log(e);
-				}
-			}
-		}
-	}
-
-	public static LaunchProperties hydrateOutputProperties(ILaunchConfiguration configuration) throws CoreException
-	{
-		LaunchProperties properties = new LaunchProperties();
-		boolean usePreferenceProperties = false; //configuration.getAttribute(JAXPLaunchConfigurationConstants.ATTR_USE_PROPERTIES_FROM_PREFERENCES, true);
-		IProcessorType pt = getProcessorInstall(configuration).getProcessorType();
-		if (usePreferenceProperties)
-		{
-			for (Map.Entry<String, String> entry : pt.getOutputPropertyValues().entrySet())
-			{
-				String name = (String) entry.getKey();
-				String value = (String) entry.getValue();
-				properties.setProperty(name, value);
-			}
-		}
-		else
-		{
-			String s = configuration.getAttribute(JAXPLaunchConfigurationConstants.ATTR_OUTPUT_PROPERTIES, (String) null);
-			if (s != null && s.length() > 0)
-			{
-				ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes());
-				properties = LaunchProperties.fromXML(inputStream);
-			}
-		}
-		return properties;
-	}
-
-	private static LaunchAttributes hydrateAttributes(ILaunchConfiguration configuration) throws CoreException
-	{
-		LaunchAttributes attributes  = new LaunchAttributes();
-		boolean useDefaultAttributes = false; //configuration.getAttribute(JAXPLaunchConfigurationConstants.ATTR_USE_FEATURES_FROM_PREFERENCES, true);
-		if (useDefaultAttributes)
-		{
-			IProcessorType pt = getProcessorInstall(configuration).getProcessorType();
-			Map<String, String> fvals = pt.getAttributeValues();
-			for (Map.Entry<String, String> entry : fvals.entrySet())
-			{
-				String uri = (String) entry.getKey();
-				IAttribute attribute = getAttribute(pt.getAttributes(), uri);
-				attributes.addAttribute(new LaunchAttribute(uri, "string", (String) entry.getValue()));
-			}
-		}
-		else
-		{
-			String s = configuration.getAttribute(JAXPLaunchConfigurationConstants.ATTR_ATTRIBUTES, (String) null);
-			if (s != null && s.length() > 0)
-			{
-				ByteArrayInputStream inputStream = new ByteArrayInputStream(s.getBytes());
-				attributes = LaunchAttributes.fromXML(inputStream);
-			}
-		}
-		return attributes;
-	}
-
-	private static IAttribute getAttribute(IAttribute[] attributes, String uri)
-	{
-		for (IAttribute attribute : attributes)
-		{
-			if (attribute.getURI().equals(uri))
-				return attribute;
-		}
-		return null;
-	}
-
-
-	public static IProcessorInstall getProcessorInstall(ILaunchConfiguration configuration) throws CoreException
-	{
-		boolean useDefaultProcessor = configuration.getAttribute(JAXPLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, true);
-		if (useDefaultProcessor)
-			return JAXPRuntime.getDefaultProcessor();
-		String processorId = configuration.getAttribute(JAXPLaunchConfigurationConstants.ATTR_PROCESSOR, ""); //$NON-NLS-1$
-		IProcessorInstall processor = JAXPRuntime.getProcessor(processorId);
-		return processor;
-	}
-
-	private static ITransformerFactory hydrateTransformerFactory(ILaunchConfiguration configuration) throws CoreException
-	{
-		IProcessorType type = getProcessorInstall(configuration).getProcessorType();
-		boolean useDefaultFactory = configuration.getAttribute(JAXPLaunchConfigurationConstants.ATTR_USE_DEFAULT_PROCESSOR, true);
-		if (useDefaultFactory)
-			return type.getDefaultTransformerFactory();
-		
-		String factoryId = configuration.getAttribute(JAXPLaunchConfigurationConstants.ATTR_TRANSFORMER_FACTORY, (String)null);
-		if (factoryId == null)
-			return null;
-		
-		for (ITransformerFactory factory : type.getTransformerFactories())
-		{
-			if (factory.getFactoryClass().equals(factoryId))
-				return factory;
-		}
-		return null;
-	}
-
-	public ITransformerFactory getTransformerFactory()
-	{
-		return transformerFactory;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/Messages.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/Messages.java
deleted file mode 100644
index a058701..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.launching.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.jaxp.launching.internal.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/OutputProperty.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/OutputProperty.java
deleted file mode 100644
index c00c96f..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/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.jaxp.launching.internal;
-
-import org.eclipse.wst.xsl.jaxp.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/OutputPropertyPreferences.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/OutputPropertyPreferences.java
deleted file mode 100644
index 4073133..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/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.jaxp.launching.internal;
-
-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.eclipse.wst.xsl.launching.config.PreferenceUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class OutputPropertyPreferences
-{
-	private final Map<String, Map<String,String>> typeProperties = new HashMap<String, Map<String,String>>();
-
-	public Map<String,String> getOutputPropertyValues(String typeId)
-	{
-		return typeProperties.get(typeId);
-	}
-
-	public void setOutputPropertyValues(String typeId, Map<String,String> 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);
-			Map<String,String> propertyValues = 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);
-			Map<String,String> 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 Map<String, String> elementAsPropertyValues(Element element)
-	{
-		Element[] propertyEls = PreferenceUtil.getChildElements(element, "property"); //$NON-NLS-1$
-		Map<String, String> propertyValues = new HashMap<String,String>();
-		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, Map<String, String> propertyValues)
-	{
-		if (propertyValues != null)
-		{
-			for (Map.Entry<String, String> entry : propertyValues.entrySet())
-			{
-				String name = entry.getKey();
-				String value = entry.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/PluginProcessorJar.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/PluginProcessorJar.java
deleted file mode 100644
index 15f1026..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/PluginProcessorJar.java
+++ /dev/null
@@ -1,78 +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.jaxp.launching.internal;
-
-import java.io.IOException;
-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.jaxp.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);
-				}
-				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)
-		{
-			JAXPLaunchingPlugin.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/PreferenceInitializer.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/PreferenceInitializer.java
deleted file mode 100644
index 0bf1bca..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/PreferenceInitializer.java
+++ /dev/null
@@ -1,67 +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.jaxp.launching.internal;
-
-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.jaxp.launching.JAXPLaunchConfigurationConstants;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-
-/**
- * Class used to initialize default preference values.
- */
-public class PreferenceInitializer extends AbstractPreferenceInitializer
-{
-
-	@Override
-	public void initializeDefaultPreferences()
-	{
-		IEclipsePreferences node = new DefaultScope().getNode(JAXPLaunchingPlugin.PLUGIN_ID);
-
-		ProcessorPreferences prefs = new ProcessorPreferences();
-		prefs.setDefaultProcessorId(JAXPRuntime.JRE_DEFAULT_PROCESSOR_ID);
-
-		OutputPropertyPreferences outputPrefs = new OutputPropertyPreferences();
-		outputPrefs.setOutputPropertyValues(JAXPRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID, JAXPRuntime.createDefaultOutputProperties(JAXPRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID));
-		outputPrefs.setOutputPropertyValues(JAXPLaunchConfigurationConstants.XALAN_TYPE_ID, JAXPRuntime.createDefaultOutputProperties(JAXPLaunchConfigurationConstants.XALAN_TYPE_ID));
-		outputPrefs.setOutputPropertyValues(JAXPLaunchConfigurationConstants.SAXON_TYPE_ID, JAXPRuntime.createDefaultOutputProperties(JAXPLaunchConfigurationConstants.SAXON_TYPE_ID));
-		outputPrefs.setOutputPropertyValues(JAXPLaunchConfigurationConstants.SAXON_1_0_TYPE_ID, JAXPRuntime.createDefaultOutputProperties(JAXPLaunchConfigurationConstants.SAXON_1_0_TYPE_ID));
-
-		try
-		{
-			String xml = prefs.getAsXML();
-			node.put(JAXPRuntime.PREF_PROCESSOR_XML, xml);
-
-			xml = outputPrefs.getAsXML();
-			node.put(JAXPRuntime.PREF_OUTPUT_PROPERTIES_XML, xml);
-
-			node.put(JAXPLaunchConfigurationConstants.ATTR_DEFAULT_DEBUGGING_INSTALL_ID, "org.eclipse.wst.xsl.launching.xalan.processor"); //$NON-NLS-1$
-		}
-		catch (ParserConfigurationException e)
-		{
-			JAXPLaunchingPlugin.log(e);
-		}
-		catch (IOException e)
-		{
-			JAXPLaunchingPlugin.log(e);
-		}
-		catch (TransformerException e)
-		{
-			JAXPLaunchingPlugin.log(e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/ProcessorInvokerDescriptor.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/ProcessorInvokerDescriptor.java
deleted file mode 100644
index eb93ad9..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/ProcessorInvokerDescriptor.java
+++ /dev/null
@@ -1,97 +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.jaxp.launching.internal;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.jaxp.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()
-	{
-		return createEntries(bundleId,classpath);
-	}
-	
-	public static String[] createEntries(String bundleId, String[] classpath)
-	{
-		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 (String jar : classpath)
-			{
-				String entry = null;
-				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);
-					try
-					{
-						File bundleFile = FileLocator.getBundleFile(Platform.getBundle(jar));
-						if (bundleFile.isDirectory())
-							entry = Utils.getPluginLocation(jar) + "/bin";
-						else
-							entry = Utils.getPluginLocation(jar);
-					}
-					catch (IOException e)
-					{}
-				}
-				else
-				{
-					entry = Utils.getFileLocation(bundleId,jar);
-				}
-				if (entry!=null)
-					entries.add(entry);
-			}
-		} 
-		catch (CoreException e) 
-		{
-			JAXPLaunchingPlugin.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/ProcessorJar.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/ProcessorJar.java
deleted file mode 100644
index fe1c76a..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/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.jaxp.launching.internal;
-
-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.jaxp.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)
-		{
-			JAXPLaunchingPlugin.log(e);
-		}
-		return url;
-	}
-
-	public IPath getPath()
-	{
-		return path;
-	}
-
-	@Override
-	public String toString()
-	{
-		return path.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/ProcessorPreferences.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/ProcessorPreferences.java
deleted file mode 100644
index 3472278..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/ProcessorPreferences.java
+++ /dev/null
@@ -1,169 +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.jaxp.launching.internal;
-
-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.jaxp.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorJar;
-import org.eclipse.wst.xsl.jaxp.launching.ProcessorInstall;
-import org.eclipse.wst.xsl.launching.config.PreferenceUtil;
-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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/ProcessorType.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/ProcessorType.java
deleted file mode 100644
index 1136929..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/ProcessorType.java
+++ /dev/null
@@ -1,225 +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.jaxp.launching.internal;
-
-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.jaxp.launching.IAttribute;
-import org.eclipse.wst.xsl.jaxp.launching.IOutputProperty;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.ITransformerFactory;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-
-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 ITransformerFactory[] transformerFactories;
-	private final URL attributePropertiesURL;
-	private final URL outputPropertiesURL;
-
-	private IAttribute[] attributes;
-	private IOutputProperty[] outputProperties;
-	private Map<String, String> outputPropertyValues;
-	private Map<String, String> attributeValues;
-
-	public ProcessorType(String id, String name, URL attributePropertiesURL, URL outputPropertiesURL, Map<String, String> attributeValues, Map<String, String> outputPropertyValues, ITransformerFactory[] transformerFactories)
-	{
-		this.id = id;
-		this.name = name;
-		this.attributePropertiesURL = attributePropertiesURL;
-		this.outputPropertiesURL = outputPropertiesURL;
-		this.attributeValues = attributeValues;
-		this.transformerFactories = transformerFactories;
-		this.outputPropertyValues = outputPropertyValues;
-	}
-
-	public String getId()
-	{
-		return id;
-	}
-
-	public String getLabel()
-	{
-		return name;
-	}
-
-	public Map<String, String> getAttributeValues()
-	{
-		return attributeValues;
-	}
-
-	public IAttribute[] getAttributes()
-	{
-		if (attributes == null)
-		{
-			if (attributePropertiesURL != null)
-				attributes = loadAttributes();
-			else
-				attributes = new IAttribute[0];
-		}
-		return attributes;
-	}
-
-	public Map<String,String> getOutputPropertyValues()
-	{
-		return outputPropertyValues;
-	}
-
-	public boolean isJREDefault()
-	{
-		return JAXPRuntime.JRE_DEFAULT_PROCESSOR_TYPE_ID.equals(id);
-	}
-
-	public ITransformerFactory[] getTransformerFactories()
-	{
-		return transformerFactories;
-	}
-	
-	public ITransformerFactory getDefaultTransformerFactory()
-	{
-		if (transformerFactories.length > 0)
-			return transformerFactories[0];
-		return null;
-	}
-
-	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
-					{
-						JAXPLaunchingPlugin.log(new CoreException(new Status(IStatus.WARNING, JAXPLaunchingPlugin.PLUGIN_ID, Messages.getString("ProcessorType.2") + outputPropertiesURL //$NON-NLS-1$
-								+ Messages.getString("ProcessorType.3") + key))); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-		catch (IOException e)
-		{
-			JAXPLaunchingPlugin.log(e);
-		}
-		finally
-		{
-			if (is != null)
-			{
-				try
-				{
-					is.close();
-				}
-				catch (IOException e)
-				{
-					JAXPLaunchingPlugin.log(e);
-				}
-			}
-		}
-		return (IOutputProperty[]) outputs.toArray(new IOutputProperty[0]);
-	}
-
-	private IAttribute[] loadAttributes()
-	{
-		BufferedInputStream is = null;
-		List<Attribute> attributesList = new ArrayList<Attribute>();
-		try
-		{
-			is = new BufferedInputStream(attributePropertiesURL.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)
-					{
-						Attribute attribute = new Attribute(uri.trim(), type.trim(), desc);
-						attributesList.add(attribute);
-					}
-					else
-					{
-						JAXPLaunchingPlugin.log(new CoreException(new Status(IStatus.WARNING, JAXPLaunchingPlugin.PLUGIN_ID, Messages.getString("ProcessorType.4") + attributePropertiesURL //$NON-NLS-1$
-								+ Messages.getString("ProcessorType.5") + key))); //$NON-NLS-1$
-					}
-				}
-			}
-
-		}
-		catch (IOException e)
-		{
-			JAXPLaunchingPlugin.log(e);
-		}
-		finally
-		{
-			if (is != null)
-			{
-				try
-				{
-					is.close();
-				}
-				catch (IOException e)
-				{
-					JAXPLaunchingPlugin.log(e);
-				}
-			}
-		}
-		IAttribute[] attributes = (IAttribute[]) attributesList.toArray(new IAttribute[0]);
-		Arrays.sort(attributes);
-		return attributes;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/TransformerFactory.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/TransformerFactory.java
deleted file mode 100644
index 4049d42..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/TransformerFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.launching.internal;
-
-import org.eclipse.wst.xsl.jaxp.launching.ITransformerFactory;
-
-public class TransformerFactory implements ITransformerFactory
-{
-	private final String factoryClass;
-	private final String name;
-	
-	public TransformerFactory(String name,String factoryClass)
-	{
-		super();
-		this.factoryClass = factoryClass;
-		this.name = name;
-	}
-
-	public String getFactoryClass()
-	{
-		return factoryClass;
-	}
-
-	public String getName()
-	{
-		return name;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/Utils.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/Utils.java
deleted file mode 100644
index 8e2ebc4..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/Utils.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.launching.internal;
-
-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, JAXPLaunchingPlugin.PLUGIN_ID, IStatus.ERROR, Messages.getString("Utils.0") + path + Messages.getString("Utils.1") + bundleId, e)); //$NON-NLS-1$ //$NON-NLS-2$
-		} 
-		return location;
-	}
-
-	public static String getPluginLocation(String bundleId) throws CoreException
-	{
-		String location = null;
-		try
-		{
-			URL url = new URL("platform:/plugin/"+bundleId);
-			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, JAXPLaunchingPlugin.PLUGIN_ID, IStatus.ERROR, Messages.getString("Utils.0") + bundleId + Messages.getString("Utils.1") + bundleId, e)); //$NON-NLS-1$ //$NON-NLS-2$
-		} 
-		return location;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/messages.properties b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/messages.properties
deleted file mode 100644
index bdf2af0..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/messages.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-Attribute.0=Value must be a double
-Attribute.1=Value must be an integer
-Attribute.2=Valid values are 'true' or 'false'
-Attribute.5=Value must be a float
-PluginProcessorJar.0=, path 
-ProcessorType.2=Output properties file 
-ProcessorType.3=\ not configured properly for key 
-ProcessorType.4=Attribute properties file 
-ProcessorType.5=\ not configured properly for key 
-Utils.0=Error determining jar file location: 
-Utils.1=\ from bundle: 
-XSLTLaunchConfigurationDelegate.0=Switch to Default 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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/AbstractRegistryReader.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/AbstractRegistryReader.java
deleted file mode 100644
index 233802a..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/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.jaxp.launching.internal.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.jaxp.launching.internal.JAXPLaunchingPlugin;
-
-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$
-		JAXPLaunchingPlugin.log(new CoreException(new Status(IStatus.ERROR, JAXPLaunchingPlugin.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/DebuggerRegistry.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/DebuggerRegistry.java
deleted file mode 100644
index 02142ab..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/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.jaxp.launching.internal.registry;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.xsl.jaxp.launching.IDebugger;
-import org.eclipse.wst.xsl.jaxp.launching.internal.DebuggerDescriptor;
-
-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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/DebuggerRegistryReader.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/DebuggerRegistryReader.java
deleted file mode 100644
index 98b9ee8..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/DebuggerRegistryReader.java
+++ /dev/null
@@ -1,97 +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.jaxp.launching.internal.registry;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.jaxp.launching.internal.DebuggerDescriptor;
-import org.eclipse.wst.xsl.jaxp.launching.internal.JAXPLaunchingPlugin;
-
-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$
-	public static final String ATT_TRANSFORMER_FACTORY = "transformerFactoryClass"; //$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;
-		}
-		String tFact = element.getAttribute(ATT_TRANSFORMER_FACTORY);
-
-		registry.addDebugger(new DebuggerDescriptor(id, element.getContributor().getName(), className, entries, name, processorTypeId, tFact));
-
-		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, JAXPLaunchingPlugin.PLUGIN_ID, "debugger"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/InvokerRegistry.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/InvokerRegistry.java
deleted file mode 100644
index 9a40916..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/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.jaxp.launching.internal.registry;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.xsl.jaxp.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/InvokerRegistryReader.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/InvokerRegistryReader.java
deleted file mode 100644
index b9e6137..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/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.jaxp.launching.internal.registry;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.jaxp.launching.internal.JAXPLaunchingPlugin;
-import org.eclipse.wst.xsl.jaxp.launching.internal.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, JAXPLaunchingPlugin.PLUGIN_ID, "invoke"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/Messages.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/Messages.java
deleted file mode 100644
index b8c8eb9..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/Messages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.wst.xsl.jaxp.launching.internal.registry;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.jaxp.launching.internal.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/ProcessorRegistry.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/ProcessorRegistry.java
deleted file mode 100644
index 1a7ee25..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/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.jaxp.launching.internal.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.jaxp.launching.IProcessorInstall;
-import org.eclipse.wst.xsl.jaxp.launching.IProcessorJar;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-import org.eclipse.wst.xsl.jaxp.launching.ProcessorInstall;
-import org.eclipse.wst.xsl.jaxp.launching.internal.JAXPLaunchingPlugin;
-import org.eclipse.wst.xsl.jaxp.launching.internal.ProcessorPreferences;
-
-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(JAXPRuntime.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 = JAXPLaunchingPlugin.getDefault().getPluginPreferences().getString(JAXPRuntime.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)
-			{
-				JAXPLaunchingPlugin.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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/ProcessorRegistryReader.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/ProcessorRegistryReader.java
deleted file mode 100644
index 1be3d31..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/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.jaxp.launching.internal.registry;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.jaxp.launching.internal.JAXPLaunchingPlugin;
-
-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, JAXPLaunchingPlugin.PLUGIN_ID, "processor"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/ProcessorTypeRegistry.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/ProcessorTypeRegistry.java
deleted file mode 100644
index 1e3e520..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/ProcessorTypeRegistry.java
+++ /dev/null
@@ -1,146 +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.jaxp.launching.internal.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 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.jaxp.launching.IProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.ITransformerFactory;
-import org.eclipse.wst.xsl.jaxp.launching.JAXPRuntime;
-import org.eclipse.wst.xsl.jaxp.launching.internal.FeaturePreferences;
-import org.eclipse.wst.xsl.jaxp.launching.internal.JAXPLaunchingPlugin;
-import org.eclipse.wst.xsl.jaxp.launching.internal.OutputPropertyPreferences;
-import org.eclipse.wst.xsl.jaxp.launching.internal.ProcessorType;
-import org.eclipse.wst.xsl.jaxp.launching.internal.TransformerFactory;
-
-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 = JAXPLaunchingPlugin.getDefault().getPluginPreferences().getString(JAXPRuntime.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)
-				{
-					JAXPLaunchingPlugin.log(e);
-				}
-			}
-
-			String propXMLString = JAXPLaunchingPlugin.getDefault().getPluginPreferences().getString(JAXPRuntime.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)
-				{
-					JAXPLaunchingPlugin.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);
-				Map<String, String> featureValues = new HashMap<String, String>();
-				Map<String, String> propertyValues = new HashMap<String, String>();
-				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_ATTRIBUTE_PROPERTIES);
-				URL featurePropertiesURL = FileLocator.find(Platform.getBundle(element.getContributor().getName()), new Path(featureProperties), null);
-				
-				List<ITransformerFactory> transFactoryList = new ArrayList<ITransformerFactory>();
-				IConfigurationElement[] transFactEls = element.getChildren(ProcessorTypeRegistryReader.EL_TRANSFORMER_FACTORY);
-				for (IConfigurationElement transFactEl : transFactEls)
-				{
-					String transFactoryName = transFactEl.getAttribute(ProcessorTypeRegistryReader.ATT_TRANSFORMER_FACTORY_NAME);
-					String transFactoryClass = transFactEl.getAttribute(ProcessorTypeRegistryReader.ATT_TRANSFORMER_FACTORY_CLASS);
-					transFactoryList.add(new TransformerFactory(transFactoryName,transFactoryClass));
-				}
-				
-				types.add(new ProcessorType(id, label, featurePropertiesURL, outputPropertiesURL, featureValues, propertyValues, transFactoryList.toArray(new ITransformerFactory[0])));
-			}
-			installTypes = 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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/ProcessorTypeRegistryReader.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/ProcessorTypeRegistryReader.java
deleted file mode 100644
index 201e2f6..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/ProcessorTypeRegistryReader.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.jaxp.launching.internal.registry;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xsl.jaxp.launching.internal.JAXPLaunchingPlugin;
-
-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_OUTPUT_PROPERTIES = "outputProperties"; //$NON-NLS-1$
-	public static final String ATT_ATTRIBUTE_PROPERTIES = "attributeProperties"; //$NON-NLS-1$
-	public static final String EL_TRANSFORMER_FACTORY = "transformerFactory";
-	public static final String ATT_TRANSFORMER_FACTORY_NAME = "name";
-	public static final String ATT_TRANSFORMER_FACTORY_CLASS = "factoryClass";
-
-	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_ATTRIBUTE_PROPERTIES);
-		if (featureProperties == null)
-		{
-			logMissingAttribute(element, ATT_ATTRIBUTE_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, JAXPLaunchingPlugin.PLUGIN_ID, "processorType"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/messages.properties b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/registry/messages.properties
deleted file mode 100644
index 6a64057..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/internal/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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/messages.properties b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/messages.properties
deleted file mode 100644
index 5d604fa..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/messages.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-XSLTRuntime.10=Failed to save process preferences
-XSLTRuntime.5=Saving attributes...
-XSLTRuntime.6=Failed to save attribute 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.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/model/JAXPDebugTarget.java b/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/model/JAXPDebugTarget.java
deleted file mode 100644
index c88f355..0000000
--- a/bundles/org.eclipse.wst.xsl.jaxp.launching/src/org/eclipse/wst/xsl/jaxp/launching/model/JAXPDebugTarget.java
+++ /dev/null
@@ -1,580 +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.jaxp.launching.model;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.Reader;
-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.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.jaxp.debug.debugger.DebugConstants;
-import org.eclipse.wst.xsl.jaxp.launching.internal.JAXPLaunchingPlugin;
-import org.eclipse.wst.xsl.launching.config.BaseLaunchHelper;
-import org.eclipse.wst.xsl.launching.model.IXSLConstants;
-import org.eclipse.wst.xsl.launching.model.IXSLDebugTarget;
-import org.eclipse.wst.xsl.launching.model.Messages;
-import org.eclipse.wst.xsl.launching.model.XSLDebugElement;
-import org.eclipse.wst.xsl.launching.model.XSLStackFrame;
-import org.eclipse.wst.xsl.launching.model.XSLThread;
-import org.eclipse.wst.xsl.launching.model.XSLValue;
-import org.eclipse.wst.xsl.launching.model.XSLVariable;
-
-public class JAXPDebugTarget 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 = 60;
-	private final int CONNECT_WAIT = 1000;
-
-	private final IProcess process;
-	private final ILaunch launch;
-	private XSLThread thread;
-	private IThread[] threads = new IThread[0];
-	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 Socket requestSocket;
-	private Socket eventSocket;
-	private Socket generateSocket;
-	private BufferedReader requestReader;
-	private BufferedReader eventReader;
-	private PrintWriter requestWriter;
-	private Reader generateReader;
-	private boolean stale;
-
-	public JAXPDebugTarget(ILaunch launch, IProcess process,
-			BaseLaunchHelper BaseLaunchHelper) throws CoreException {
-		super(null);
-		this.launch = launch;
-		this.process = process;
-		this.requestSocket = attemptConnect(BaseLaunchHelper.getRequestPort());
-		this.eventSocket = attemptConnect(BaseLaunchHelper.getEventPort());
-		this.generateSocket = attemptConnect(BaseLaunchHelper.getGeneratePort());
-
-		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()));
-				this.generateReader = new InputStreamReader(generateSocket.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);
-		}
-	}
-	
-	public Reader getGenerateReader()
-	{
-		return generateReader;
-	}
-
-	private void abort(String message, Throwable e) throws DebugException {
-		if (!getDebugTarget().isTerminated())
-			getDebugTarget().getProcess().terminate();
-		throw new DebugException(new Status(IStatus.ERROR,
-				JAXPLaunchingPlugin.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,
-							JAXPLaunchingPlugin.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) {
-			name = launch.getAttribute("launchName");
-		}
-		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 =
-			// BaseLaunchHelper.getPipeline().getTransformDefs().iterator();
-			// iter.hasNext();)
-			// {
-			// LaunchTransform lt = (LaunchTransform) iter.next();
-			// if (marker.getResource().getLocation().equals(lt.getLocation()))
-			// return true;
-			// }
-			// }
-			// catch (CoreException e)
-			// {
-			// JAXPLaunchingPlugin.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 getProcess().isTerminated();
-	}
-
-	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) {
-						JAXPLaunchingPlugin.log(e);
-					} catch (MalformedURLException e) {
-						JAXPLaunchingPlugin.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) {
-				JAXPLaunchingPlugin.log(e);
-			} catch (MalformedURLException e) {
-				JAXPLaunchingPlugin.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() {
-		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 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) {
-//			if (Debug.debugLauncher) {
-//				System.out.println("REQUEST: " + request);
-//			}
-			requestWriter.println(request);
-			requestWriter.flush();
-			try {
-				// wait for response
-				response = requestReader.readLine();
-//				if (Debug.debugLauncher) {
-//					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 {
-								debugEventMsg(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 {
-								debugEventMsg(event);
-							}
-						} else {
-							debugEventMsg(event);
-						}
-					}
-				} catch (IOException e) {
-					terminated();
-				}
-			}
-			return Status.OK_STATUS;
-		}
-
-		private void debugEventMsg(String event) {
-//			if (Debug.debugLauncher) {
-//				 System.out.println("Did not understand event:" + event);
-//			}
-		}
-	}
-}
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 c12d9e1..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +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: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
diff --git a/bundles/org.eclipse.wst.xsl.saxon/SaxonAttributes.properties b/bundles/org.eclipse.wst.xsl.saxon/SaxonAttributes.properties
deleted file mode 100644
index d64ab0e..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/SaxonAttributes.properties
+++ /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
-###############################################################################
-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.
-
-RECOGNIZE_URI_QUERY_PARAMETERS=http://saxon.sf.net/feature/recognize-uri-query-parameters
-RECOGNIZE_URI_QUERY_PARAMETERS.TYPE=boolean
-RECOGNIZE_URI_QUERY_PARAMETERS.DESC=determines whether query parameters (things after "?")\n\
- in a URI passed to the document() or doc() function are specially recognized by the system default URIResolver.\n\
- Allowed parameters include, for example validation=strict to perform schema validation, and strip-space=yes\n\
- to perform stripping of all whitespace-only text nodes
-
-COLLATION_URI_RESOLVER=http://saxon.sf.net/feature/collation-uri-resolver
-COLLATION_URI_RESOLVER.TYPE=object
-COLLATION_URI_RESOLVER.DESC=A net.sf.saxon.sort.CollationURIResolver used to resolve collation URIs used in stylesheets compiled or executed under the\n\
- control of this TransformerFactory
- 
-COLLECTION_URI_RESOLVER=http://saxon.sf.net/feature/collection-uri-resolver
-COLLECTION_URI_RESOLVER.TYPE=object
-COLLECTION_URI_RESOLVER.DESC=A net.sf.saxon.sort.CollectionURIResolver used to resolve collection URIs used in calls of the collection() function
\ No newline at end of file
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 2199df3..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, 2008</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 b44dde2..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/,\
-               .,\
-               SaxonAttributes.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 4538751..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/plugin.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.saxon
-Bundle-Name.0 = XSL Saxon Support (Incubating)
-processorType.label.0 = Saxon (XSLT 2.0)
-processorType.label.1 = Saxon (XSLT 1.0)
-Bundle-Vendor.0 = Eclipse.org
-transformerFactorySaxon6 = Saxon 6
-transformerSaxonXSLT2 = Saxon 7
\ 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 8be0a82..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.wst.xsl.jaxp.launching.processorType">
-      <processorType
-            attributeProperties="SaxonAttributes.properties"
-            id="org.eclipse.wst.xsl.saxon_1_0.processorType"
-            label="%processorType.label.1"
-            outputProperties="SaxonOutputProperties.properties">
-         <transformerFactory
-               factoryClass="com.icl.saxon.TransformerFactoryImpl"
-               name="%transformerFactorySaxon6">
-         </transformerFactory>
-      </processorType>
-      <processorType
-            attributeProperties="SaxonAttributes.properties"
-            id="org.eclipse.wst.xsl.saxon.processorType"
-            label="%processorType.label.0"
-            outputProperties="SaxonOutputProperties.properties">
-         <transformerFactory
-               factoryClass="net.sf.saxon.TransformerFactoryImpl"
-               name="%transformerSaxonXSLT2">
-         </transformerFactory>
-      </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 b662d7d..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/.project
+++ /dev/null
@@ -1,34 +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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/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 7022328..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,84 +0,0 @@
-#Fri Sep 05 23:58:31 GMT 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.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.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.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-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.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/bundles/org.eclipse.wst.xsl.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xsl.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index ade4019..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,22 +0,0 @@
-#Fri Sep 05 23:58:31 GMT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
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 cf4970f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,44 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xsl.ui;singleton:=true
-Bundle-Version: 1.1.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.wst.xml.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.ui.console;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.3.100,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="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.forms;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.wst.xml.xpath.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.xml.xpath.core;bundle-version="[1.0.0,2.0.0)",
- com.ibm.icu;bundle-version="3.8.1",
- org.eclipse.wst.html.ui;bundle-version="1.0.400"
-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.contentassist.contentmodel;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.doubleclick;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.editor;x-internal:=true,
- org.eclipse.wst.xsl.ui.internal.handlers;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
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.wst.xsl.ui/about.html b/bundles/org.eclipse.wst.xsl.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.xsl.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, 2008</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.ui/build.properties b/bundles/org.eclipse.wst.xsl.ui/build.properties
deleted file mode 100644
index 60e64be..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               templates/,\
-               about.html,\
-               xslfiles/
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/XSDFile.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/XSDFile.gif
deleted file mode 100644
index 3900f1b..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/XSDFile.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/field_default_obj.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/field_default_obj.gif
deleted file mode 100644
index 6929d3d..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/field_default_obj.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/import.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/import.gif
deleted file mode 100644
index 9e44ce5..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/import.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/imports.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/imports.gif
deleted file mode 100644
index ea94702..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/imports.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/mode.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/mode.gif
deleted file mode 100644
index f4a1ea1..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/mode.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/newdtd_wiz.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/newdtd_wiz.gif
deleted file mode 100644
index 10b1a77..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/newdtd_wiz.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/over_co.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/over_co.gif
deleted file mode 100644
index 938767b..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/over_co.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/package_obj.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/package_obj.gif
deleted file mode 100644
index 131c28d..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/package_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/template.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/template.gif
deleted file mode 100644
index 0b12869..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/template.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/icons/full/xml_perspective.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/xml_perspective.gif
deleted file mode 100644
index f439b47..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/xml_perspective.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/xslt_file.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/xslt_file.gif
deleted file mode 100644
index 9b0eb46..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/xslt_file.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl.ui/icons/full/xslt_launch.gif b/bundles/org.eclipse.wst.xsl.ui/icons/full/xslt_launch.gif
deleted file mode 100644
index bfe15f8..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/icons/full/xslt_launch.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 85231d0..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/plugin.properties
+++ /dev/null
@@ -1,33 +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=XSL Editor and Validation (Incubating)
-perspectiveName=XML
-page.name.0 = XSL
-
-editorName = XSL Editor
-wizardNameXSL = XSL
-wizardDescriptionXSL = Create a new XSL Stylesheet
-contextTypeNewXSL = New XSL
-pageNameTemplates = Templates
-pageNameValidation = Validation
-commandOpenSelection = Open Selection
-commandTooltipOpenSelection = Open Selection
-commandTooltipNewXMLFile = New XML File
-commandTooltipNewXMLFile2 = New XML File
-commandTooltipNewXSDFile = New XML Schema File
-commandTooltipNewXSLFile = New XSL File
-viewNameStylesheet = Stylesheet
-pageSyntaxColoring = Syntax Coloring
-XSL_Property_validation = XSLT Validation
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 24d784c..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/plugin.xml
+++ /dev/null
@@ -1,352 +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="$nl$/icons/full/xml_perspective.gif" 
-			name="%perspectiveName">
-		</perspective>
-	</extension>
-	
-	<extension point="org.eclipse.ui.editors">
-		<editor name="%editorName" 
-			icon="$nl$/icons/full/xslt_file.gif"
-			contributorClass="org.eclipse.wst.xml.ui.internal.tabletree.SourcePageActionContributor"
-			class="org.eclipse.wst.xsl.ui.internal.editor.XSLEditor"
-			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>
-	    <doubleClickStrategy
-           class="org.eclipse.wst.xsl.ui.internal.doubleclick.XSLDoubleClickStrategy"
-           target="org.eclipse.wst.xsl.XSL_XPATH">
-	    </doubleClickStrategy>
-		<provisionalDefinition
-			type="activecontexts"
-			value="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.navigation, org.eclipse.wst.xml.cleanup, org.eclipse.wst.xml.comments, org.eclipse.wst.xml.selection, org.eclipse.wst.xml.dependencies, org.eclipse.wst.xml.grammar, org.eclipse.wst.xml.expand, org.eclipse.wst.xml.occurrences"
-        	target="org.eclipse.core.runtime.xml" />
-        <provisionalDefinition
-            type="preferencepages"
-            value="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage, org.eclipse.wst.xsl.ui.template.preferencePage, org.eclipse.wst.xsl.ui.preferences.Validation, org.eclipse.wst.xml.xpath.ui.XPathPreferencePage, org.eclipse.wst.xsl.ui.XPath"
-            target="org.eclipse.wst.xml.core.xslsource"/>
-	</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="$nl$/icons/full/xslt_file.gif"
-			id="org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard"
-			name="%wizardNameXSL" 
-			preferredPerspectives="org.eclipse.wst.xsl.ui.perspective">
-			<description>%wizardDescriptionXSL</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="%contextTypeNewXSL">
-		</contextType>
-		<include file="templates/file_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="%pageNameTemplates">
-		</page>
-
-		<page category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
-			class="org.eclipse.wst.xsl.ui.internal.preferences.XSLValidationPreferencePage"
-			id="org.eclipse.wst.xsl.ui.preferences.Validation" 
-			name="%pageNameValidation">
-		</page>
-		<page category="org.eclipse.wst.xsl.ui.preferences.BasePreferencePage"
-		    class="org.eclipse.wst.xsl.ui.internal.preferences.XSLSyntaxColoringPage"
-		    id="org.eclipse.wst.xsl.ui.preferences.SyntaxColoring"
-		    name="%pageSyntaxColoring"/>
-	</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.sse.ST_DEFAULT"/>
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
-				<partitionType id="org.eclipse.wst.xsl.XSL_XPATH"/>
-			</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" />
-				<partitionType id="org.eclipse.wst.xsl.XSL_XPATH" />
-			</contentTypeIdentifier>
-		</validator>
-	</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>
-  <extension
-        point="org.eclipse.ui.handlers">
-     <handler
-           class="org.eclipse.wst.xsl.ui.internal.handlers.OpenDeclarationHandler"
-           commandId="org.eclipse.wst.sse.ui.open.file.from.source">
-     </handler>
-  </extension>
-  <extension
-        point="org.eclipse.ui.menus">
-     <menuContribution
-           locationURI="popup:org.eclipse.wst.sse.ui.StructuredTextEditor.EditorContext?before=additions">
-        <command
-              commandId="org.eclipse.wst.sse.ui.open.file.from.source"
-              id="openSelection"
-              label="%commandOpenSelection"
-              style="push"
-              tooltip="%commandTooltipOpenSelection">
-           <visibleWhen
-                 checkEnabled="false">
-           </visibleWhen>
-        </command>
-     </menuContribution>
-     <menuContribution
-              locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
-        <toolbar
-              id="org.eclipse.wst.xsl.ui.design.NewFileToolBar">
-      <separator
-           name="org.eclipse.wst.xsl.toolbar.separator.1"
-           visible="true">
-       </separator>
-        <command
-              commandId="org.eclipse.ui.newWizard"
-              icon="$nl$/icons/full/new_xml.gif"
-              id="org.eclipse.wst.xsl.ui.newXMLFile"
-              style="push"
-              tooltip="%commandTooltipNewXMLFile">
-             <parameter
-                   name="newWizardId"
-                   value="org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard">
-             </parameter>
-          <visibleWhen checkEnabled="false">
-			<with variable="activeWorkbenchWindow.activePerspective">
-			       <equals value="org.eclipse.wst.xsl.ui.perspective"/>
-			    </with>
-           </visibleWhen>         
-        </command>
-        <command
-              commandId="org.eclipse.ui.newWizard"
-              icon="$nl$/icons/full/newdtd_wiz.gif"
-              id="org.eclipse.wst.xsl.ui.newDTDFile"
-              style="push"
-              tooltip="%commandTooltipNewXMLFile2">
-             <parameter
-                   name="newWizardId"
-                   value="org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard">
-             </parameter>
-          <visibleWhen checkEnabled="false">
-			<with variable="activeWorkbenchWindow.activePerspective">
-			       <equals value="org.eclipse.wst.xsl.ui.perspective"/>
-			    </with>
-           </visibleWhen>         
-        </command>
-        <command
-              commandId="org.eclipse.ui.newWizard"
-              icon="$nl$/icons/full/XSDFile.gif"
-              id="org.eclipse.wst.xsl.ui.newXSDFile"
-              style="push"
-              tooltip="%commandTooltipNewXSDFile">
-             <parameter
-                   name="newWizardId"
-                   value="org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard">
-             </parameter>
-          <visibleWhen checkEnabled="false">
-			<with variable="activeWorkbenchWindow.activePerspective">
-			       <equals value="org.eclipse.wst.xsl.ui.perspective"/>
-			    </with>
-           </visibleWhen>         
-        </command>        
-                
-        <command
-              commandId="org.eclipse.ui.newWizard"
-              icon="$nl$/icons/full/xslt_file.gif"
-              id="org.eclipse.wst.xsl.ui.newXSLFile"
-              style="push"
-              tooltip="%commandTooltipNewXSLFile">
-             <parameter
-                   name="newWizardId"
-                   value="org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard">
-             </parameter>
-          <visibleWhen checkEnabled="false">
-			<with variable="activeWorkbenchWindow.activePerspective">
-			       <equals value="org.eclipse.wst.xsl.ui.perspective"/>
-			    </with>
-           </visibleWhen>         
-        </command>
-      <separator
-           name="additions"
-           visible="true">
-       </separator>
-      </toolbar> 
-     </menuContribution>
-  </extension>
-  <extension
-        point="org.eclipse.ui.views">
-     <view
-           class="org.eclipse.wst.xsl.ui.internal.StylesheetView"
-           id="org.eclipse.wst.xsl.ui.view.outline"
-           name="%viewNameStylesheet"
-           category="org.eclipse.wst.xml"
-           restorable="true">
-     </view>
-  </extension>
-  <extension point="org.eclipse.core.runtime.adapters">		
-		<factory 
-            class="org.eclipse.wst.xsl.ui.internal.XSLModelAdapterFactory" 
-            adaptableType="org.eclipse.wst.xsl.core.model.XSLModelObject">
-            <adapter type="org.eclipse.ui.model.IWorkbenchAdapter"/>
-		</factory>
-   </extension>     	
-   
-	<extension point="org.eclipse.ui.editors.annotationTypes">
-		<type
-			name="org.eclipse.wst.xsl.ui.override">
-		</type>
-	</extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-	  <specification
-            annotationType="org.eclipse.wst.xsl.ui.override"
-            label="Override"
-            icon="$nl$/icons/full/over_co.gif"
-			annotationImageProvider ="org.eclipse.wst.xsl.ui.internal.editor.OverrideIndicatorImageProvider"
-            textPreferenceKey="overrideIndicator"
-            textPreferenceValue="false"
-            highlightPreferenceKey="overrideIndicatorHighlighting"
-            highlightPreferenceValue="false"
-            contributesToHeader="false"
-            overviewRulerPreferenceKey="overrideIndicatorInOverviewRuler"
-            overviewRulerPreferenceValue="false"
-            verticalRulerPreferenceKey="overrideIndicatorInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-            colorPreferenceKey="overrideIndicatorColor"
-            colorPreferenceValue="180,207,205"
-            presentationLayer="3"
-            showInNextPrevDropdownToolbarActionKey="showoverrideIndicatorInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            isGoToNextNavigationTargetKey="isOverrideIndicatorGoToNextNavigationTarget"
-	        isGoToNextNavigationTarget="false"
-            isGoToPreviousNavigationTargetKey="isOverrideIndicatorGoToPreviousNavigationTarget"
-	        isGoToPreviousNavigationTarget="false"
-            textStylePreferenceKey="overrideIndicatorTextStyle"
-            textStylePreferenceValue="SQUIGGLES">
-	  </specification>
-	</extension>
-	
-	<extension point="org.eclipse.core.runtime.preferences">
-		<initializer
-			class="org.eclipse.wst.xsl.ui.internal.preferences.XSLUIPreferenceInitializer" />
-	</extension>
-	
-	<extension point="org.eclipse.ui.propertyPages">
-		<page
-			name="%XSL_Property_validation"
-			class="org.eclipse.wst.xsl.ui.internal.preferences.XSLValidationPreferencePage"
-			id="org.eclipse.wst.xsl.ui.propertyPage.project.validation"
-			category="ValidationPropertiesPage">
--			<enabledWhen>
-				<adapt type="org.eclipse.core.resources.IProject">
-					
-				</adapt>
-			</enabledWhen>
-		</page>		
-	</extension>
-	
-	
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/ListWorkbenchAdapter.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/ListWorkbenchAdapter.java
deleted file mode 100644
index 5a4b46e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/ListWorkbenchAdapter.java
+++ /dev/null
@@ -1,58 +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;
-
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.wst.xsl.core.model.Stylesheet;
-
-public class ListWorkbenchAdapter implements IWorkbenchAdapter
-{
-	private Object parent;
-	private Object[] children;
-	private String text;
-	private ImageDescriptor image;
-	
-	public ListWorkbenchAdapter(Stylesheet stylesheet, List list, String label, String imgPath)
-	{
-		parent = stylesheet;
-		if (list != null)
-			children = list.toArray();
-		else
-			children = new Object[0];
-		text = label;
-		if (imgPath!=null)
-			image = XSLUIPlugin.imageDescriptorFromPlugin(XSLUIPlugin.PLUGIN_ID, imgPath);
-	}
-	
-	public ImageDescriptor getImageDescriptor(Object object)
-	{
-		return image;
-	}
-	
-	public String getLabel(Object o)
-	{
-		return text;
-	}
-
-	public Object[] getChildren(Object o)
-	{
-		return children;
-	}
-
-	public Object getParent(Object o)
-	{
-		return parent;
-	}
-
-}
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 2e89dd8..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/StructuredTextViewerConfigurationXSL.java
+++ /dev/null
@@ -1,136 +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 (isXMLPartition(partitionType)) {
-    		providers = new LineStyleProvider[] {getLineStyleProviderForXSL()};
-		}
-		return providers;
-	}
-
-	private boolean isXMLPartition(String partitionType) {
-		return partitionType == IXMLPartitions.XML_DEFAULT
-				|| partitionType == IXMLPartitions.XML_CDATA
-				|| partitionType == IXMLPartitions.XML_COMMENT
-				|| partitionType == IXMLPartitions.XML_DECLARATION
-				|| partitionType == IXMLPartitions.XML_PI
-				|| partitionType == IXSLPartitions.XSL_XPATH;
-	}
-	
-	protected LineStyleProvider getLineStyleProviderForXSL() {
-		if (fLineStyleProviderForXSL == null) {
-			fLineStyleProviderForXSL = new LineStyleProviderForXSL();
-		}
-		return fLineStyleProviderForXSL;
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/StylesheetView.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/StylesheetView.java
deleted file mode 100644
index b00aa27..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/StylesheetView.java
+++ /dev/null
@@ -1,156 +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;
-
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.model.BaseWorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.eclipse.wst.xsl.core.model.XSLModelObject;
-import org.eclipse.wst.xsl.core.model.XSLNode;
-
-public class StylesheetView extends ViewPart
-{
-	private IEditorPart activeEditor;
-	private boolean isFiringSelection;
-	private TreeViewer tv;
-	private IPartListener partListener = new IPartListener(){
-		
-		public void partActivated(IWorkbenchPart part)
-		{
-			if (part instanceof IEditorPart)
-			{
-				IEditorPart editor = (IEditorPart)part;
-				IEditorInput edInput = editor.getEditorInput();
-				if (edInput instanceof IFileEditorInput)
-				{
-					IFileEditorInput edFileInput = (IFileEditorInput)edInput;
-					if (XSLCore.isXSLFile(edFileInput.getFile()))
-					{
-						activeEditor = editor;
-						StylesheetModel model = XSLCore.getInstance().getStylesheet(edFileInput.getFile());
-						tv.setInput(model.getStylesheet());
-					}
-				}
-			}
-		}
-
-		public void partBroughtToTop(IWorkbenchPart part)
-		{
-		}
-
-		public void partClosed(IWorkbenchPart part)
-		{
-			if (part == activeEditor)
-			{
-				tv.setInput(null);
-				activeEditor = null;
-			}
-		}
-
-		public void partDeactivated(IWorkbenchPart part)
-		{
-		}
-
-		public void partOpened(IWorkbenchPart part)
-		{
-		}
-		
-	}; 
-
-	@Override
-	public void init(IViewSite site, IMemento memento) throws PartInitException
-	{
-		super.init(site, memento);
-		site.getPage().addPartListener(partListener);
-	}
-	
-	@Override
-	public void dispose()
-	{
-		getSite().getPage().removePartListener(partListener);
-		super.dispose();
-	}
-	
-	@Override
-	public void createPartControl(Composite parent)
-	{
-		Tree tree = new Tree(parent,SWT.NONE);
-		this.tv = new TreeViewer(tree);
-		tv.setContentProvider(new BaseWorkbenchContentProvider());
-		tv.setLabelProvider(new WorkbenchLabelProvider());
-		tv.addSelectionChangedListener(new ISelectionChangedListener(){
-
-			public void selectionChanged(SelectionChangedEvent event)
-			{
-				if (getSite().getPage().getActivePart() == StylesheetView.this)
-					handleTreeSelection((IStructuredSelection)event.getSelection(),false);
-			}
-		});
-		tv.addDoubleClickListener(new IDoubleClickListener(){
-
-			public void doubleClick(DoubleClickEvent event)
-			{
-				handleTreeSelection((IStructuredSelection)event.getSelection(),true);
-			}
-			
-		});
-	}
-	
-	private void handleTreeSelection(IStructuredSelection selection, boolean reveal)
-	{
-		if (activeEditor != null)
-		{
-			isFiringSelection = true;
-			if (selection.getFirstElement() instanceof XSLNode)
-			{
-				XSLNode node = (XSLNode)selection.getFirstElement();
-				
-				ITextEditor textEditor = (ITextEditor)activeEditor.getAdapter(ITextEditor.class);
-				if (textEditor != null)
-				{
-					//if (reveal)
-						textEditor.selectAndReveal(node.getOffset(), 0);
-					//else
-						// textEditor.setHighlightRange(node.getOffset(), 0, true);
-				}
-			}
-			isFiringSelection = false;
-		}
-	}
-
-	@Override
-	public void setFocus()
-	{
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLModelAdapterFactory.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLModelAdapterFactory.java
deleted file mode 100644
index c67e2c9..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLModelAdapterFactory.java
+++ /dev/null
@@ -1,138 +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;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.wst.xsl.core.model.Import;
-import org.eclipse.wst.xsl.core.model.Include;
-import org.eclipse.wst.xsl.core.model.Stylesheet;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.eclipse.wst.xsl.core.model.Template;
-import org.eclipse.wst.xsl.core.model.Variable;
-import org.eclipse.wst.xsl.core.model.XSLModelObject;
-
-public class XSLModelAdapterFactory implements IAdapterFactory
-{
-	private static Class[] LIST = new Class[]{IWorkbenchAdapter.class};
-	private IWorkbenchAdapter adapter = new XSLWorkbenchAdapter();
-	
-	public Object getAdapter(Object adaptableObject, Class adapterType)
-	{
-		if (IWorkbenchAdapter.class.equals(adapterType))
-			return adapter;
-		return null;
-	}
-	
-	public Class[] getAdapterList()
-	{
-		return LIST;
-	}
-	
-	private class XSLWorkbenchAdapter implements IWorkbenchAdapter
-	{
-		private final Object[] EMPTY = new Object[0];
-
-		public Object[] getChildren(Object o)
-		{
-			XSLModelObject obj = (XSLModelObject)o;
-			switch(obj.getModelType())
-			{
-//				case STYLESHEET_MODEL:
-//					StylesheetModel model = (StylesheetModel)obj;
-//					Stylesheet stylesheet = model.getStylesheet();
-//					return new Object[]{
-//						new ListWorkbenchAdapter(stylesheet,null,stylesheet.getVersion(),"icons/full/xslt_launch.gif"),
-//						new ListWorkbenchAdapter(stylesheet,model.getImports(),"Imports","icons/full/imports.gif"),
-//						new ListWorkbenchAdapter(stylesheet,model.getIncludes(),"Includes","icons/full/imports.gif"),
-//						new ListWorkbenchAdapter(stylesheet,model.getGlobalVariables(),"Variables",null),
-//						new ListWorkbenchAdapter(stylesheet,model.getTemplates(),"Templates",null)
-//					};
-				case STYLESHEET:
-					Stylesheet stylesheet = (Stylesheet)obj;
-					return new Object[]{
-						new ListWorkbenchAdapter(stylesheet,null,stylesheet.getVersion(),"icons/full/xslt_launch.gif"),
-						new ListWorkbenchAdapter(stylesheet,stylesheet.getImports(),"Imports","icons/full/imports.gif"),
-						new ListWorkbenchAdapter(stylesheet,stylesheet.getIncludes(),"Includes","icons/full/imports.gif"),
-						new ListWorkbenchAdapter(stylesheet,stylesheet.getGlobalVariables(),"Variables",null),
-						new ListWorkbenchAdapter(stylesheet,stylesheet.getTemplates(),"Templates",null)
-					};
-			}
-			return EMPTY;
-		}
-
-		public ImageDescriptor getImageDescriptor(Object object)
-		{
-			XSLModelObject obj = (XSLModelObject)object;
-			String path = null;
-			switch(obj.getModelType())
-			{
-				case STYLESHEET:
-					path = "icons/full/xslt_launch.gif";
-					break;
-				case IMPORT:
-				case INCLUDE:
-					path = "icons/full/import.gif";
-					break;
-				case TEMPLATE:
-					path = "icons/full/methdef_obj.gif";
-					break;
-				case VARIABLE:
-					path = "icons/full/field_default_obj.gif";
-					break;
-			}
-			return path == null ? null : XSLUIPlugin.imageDescriptorFromPlugin(XSLUIPlugin.PLUGIN_ID, path);
-		}
-
-		public String getLabel(Object o)
-		{
-			String label = null;
-			XSLModelObject obj = (XSLModelObject)o;
-			switch(obj.getModelType())
-			{
-				case STYLESHEET:
-					Stylesheet stylesheet = (Stylesheet)obj;
-					label = stylesheet.getVersion() == null ? "?" : stylesheet.getVersion();
-					break;
-				case IMPORT:
-					Import imp = (Import)obj;
-					label = imp.getHref();
-					break;
-				case INCLUDE:
-					Include inc = (Include)obj;
-					label = inc.getHref();
-					break;
-				case TEMPLATE:
-					Template t = (Template)obj;
-					StringBuffer sb = new StringBuffer();
-					if (t.getName() != null)
-						sb.append(t.getName()).append(" ");
-					if (t.getMatch() != null)
-						sb.append(t.getMatch()).append(" ");
-					if (t.getMode() != null)
-						sb.append("(").append(t.getMode()).append(")");
-					label = sb.toString();
-					break;
-				case VARIABLE:
-					Variable v = (Variable)obj;
-					label = v.getName();
-					break;
-			}
-			return label;
-		}
-
-		public Object getParent(Object o)
-		{
-			return null;
-		}		
-	}
-}
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 8966542..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLUIConstants.java
+++ /dev/null
@@ -1,17 +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";
-	public static final String NEW_FILE_TEMPLATE_NAME = "NEW_FILE_TEMPLATE_NAME";
-}
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 e0b3da7..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLUIPlugin.java
+++ /dev/null
@@ -1,154 +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;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-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;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class XSLUIPlugin extends AbstractUIPlugin {
-	
-	/**
-	 * The template store for the xsl editor.
-	 */
-	private TemplateStore fTemplateStore;
-
-	
-    private ScopedPreferenceStore preferenceStore;
-    
-	/**
-	 * The template context type registry for the xml editor.
-	 */
-	private ContributionContextTypeRegistry fContextTypeRegistry;
-	
-	/**
-	 * The plugin id for this plugin.
-	 */
-	static public String PLUGIN_ID = "org.eclipse.wst.xsl.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static XSLUIPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public XSLUIPlugin() {
-	}
-
-	/*
-	 * (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 XSLUIPlugin 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());
-	}
-
-	/**
-	 * 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)
-			{
-				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;
-	}
-	
-	public static File makeFileFor(String directory, String filename) throws IOException {
-		Bundle bundle = Platform.getBundle(XSLUIPlugin.PLUGIN_ID);
-		URL url = bundle.getEntry("/");
-		URL localURL = FileLocator.toFileURL(url);
-		String installPath = localURL.getPath();
-		String totalDirectory = installPath + directory;
-		String totalPath = totalDirectory + "/" + filename;
-		URL totalURL = new URL(url, totalPath);
-		//URL finalurl = Platform.asLocalURL(totalURL);
-		String finalFile = totalURL.getFile();
-		File file = new File(finalFile);
-		return file;
-	}
-
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewDTDFileWizardDelegate.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewDTDFileWizardDelegate.java
deleted file mode 100644
index b7a2d5e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewDTDFileWizardDelegate.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 NewDTDFileWizardDelegate implements IWorkbenchWindowActionDelegate
-{
-	private NewWizardAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewWizardAction("org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard");
-	}
-
-	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/NewWSDLFileWizardDelegate.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewWSDLFileWizardDelegate.java
deleted file mode 100644
index cd8da74..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewWSDLFileWizardDelegate.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 NewWSDLFileWizardDelegate implements IWorkbenchWindowActionDelegate
-{
-	private NewWizardAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewWizardAction("org.eclipse.wst.wsdl.ui");
-	}
-
-	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/NewWizardAction.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewWizardAction.java
deleted file mode 100644
index e8732dd..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewWizardAction.java
+++ /dev/null
@@ -1,75 +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.core.runtime.CoreException;
-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.IWorkbenchWizard;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.wizards.IWizardDescriptor;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-public class NewWizardAction extends Action
-{
-	private static final int SIZING_WIZARD_WIDTH = 500;
-	private static final int SIZING_WIZARD_HEIGHT = 500;
-
-	private ISelection selection;
-	private String id;
-	
-	public NewWizardAction(String id)
-	{
-		this.id = id;
-	}
-
-	public void run()
-	{
-		IWizardDescriptor desc = PlatformUI.getWorkbench().getNewWizardRegistry().findWizard(id);
-		if (desc == null)
-			return;
-		try
-		{
-			Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-			IWorkbenchWizard wizard = desc.createWizard();
-
-			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();
-		}
-		catch (CoreException e)
-		{
-			XSLUIPlugin.log(e);
-		}
-	}
-
-	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 b5232f8..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 NewWizardAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewWizardAction("org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard");
-	}
-
-	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/NewXSDFileWizardDelegate.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXSDFileWizardDelegate.java
deleted file mode 100644
index e521fdb..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXSDFileWizardDelegate.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 NewXSDFileWizardDelegate implements IWorkbenchWindowActionDelegate
-{
-	private NewWizardAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewWizardAction("org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard");
-	}
-
-	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/NewXSLFileWizardDelegate.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXSLFileWizardDelegate.java
deleted file mode 100644
index e14ca33..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 NewWizardAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewWizardAction("org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard");
-	}
-
-	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/AbstractXSLContentAssistRequest.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/AbstractXSLContentAssistRequest.java
deleted file mode 100644
index a3fc316..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/AbstractXSLContentAssistRequest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-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.ITextRegionCollection;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceTable;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.ui.internal.contentassist.ProposalComparator;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * An extension of the XML ContentAssistRequest class.  This provides
- * a basis for the XSL content assistance.  Classes may subclass this
- * class and implement specific functionality.
- * 
- * @author dcarver
- *
- */
-public abstract class AbstractXSLContentAssistRequest implements IContentAssistProposalRequest {
-	protected IStructuredDocumentRegion documentRegion = null;
-	protected ArrayList<ICompletionProposal> macros = new ArrayList<ICompletionProposal>();
-	protected String matchString;
-	protected Node node = null;
-	protected ArrayList<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>();
-	protected ITextRegion region = null;
-	protected int replacementBeginPosition;
-	protected int replacementLength;
-	protected ITextViewer textViewer = null;
-
-
-	/**
-	 * Handles Content Assistance requests for Select Attributes.  This is called an instantiated
-	 * through the use of the computeProposals method from the XSLContentAssistProcessor.  It will
-	 * calculate the available proposals that are available for the XSL select attribute.
-	 * 
-	 * @param node
-	 * @param parent
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	
-	public AbstractXSLContentAssistRequest(Node node,
-			IStructuredDocumentRegion documentRegion,
-			ITextRegion completionRegion, int begin, int length, String filter,
-			ITextViewer textViewer) {
-		setNode(node);
-		setDocumentRegion(documentRegion);
-		setRegion(completionRegion);
-		setMatchString(filter);
-		setReplacementBeginPosition(begin);
-		setReplacementLength(length);
-		this.textViewer = textViewer;
-	}
-
-	/**
-	 * Returns a list of proposals.  Implementations are to provide the appropriate
-	 * implementation for the proposals they would like to return.   Use of the getAllCompletionProposals
-	 * should be used to return the actual proposals from this method.
-	 * @return
-	 */
-	public abstract ArrayList<ICompletionProposal> getCompletionProposals();
-	
-	protected ArrayList<ICompletionProposal> getAllCompletionProposals() {
-		ArrayList<ICompletionProposal> allProposals = new ArrayList<ICompletionProposal>();
-		if ((getProposals().size() > 0) || (getMacros().size() > 0)) {
-			allProposals.addAll(getProposals());
-			allProposals.addAll(getMacros());
-			allProposals = sortProposals(allProposals);
-		}
-		return allProposals;
-	}
-
-	
-	/**
-	 * Checks to make sure that the NodeList has data
-	 * @param nodes A NodeList object
-	 * @return True if has data, false if empty
-	 */
-	protected boolean hasNodes(NodeList nodes) {
-		return nodes != null && nodes.getLength() > 0;
-	}
-
-	/**
-	 * Get the cursor position within the Text Viewer
-	 * @return An int value containing the cursor position
-	 */
-	protected int getCursorPosition() {
-		return textViewer.getTextWidget().getCaretOffset();
-	}
-	
-	protected Collection<NamespaceInfo> getNamespaces(IDOMElement element) {
-		 NamespaceTable table = new NamespaceTable(element.getOwnerDocument());
-		 table.visitElement(element);
-		 
-		 Collection<NamespaceInfo> namespaceInfoList =  table.getNamespaceInfoCollection();
-		 
-		 return namespaceInfoList;
-	}
-
-	/**
-	 * Retrieves the base location for the IDOMDocument for this class. This is
-	 * used to populate a new Path class for retrieving an IFile instance.
-	 * @return
-	 */
-	protected String getLocation() {
-		IDOMDocument document = (IDOMDocument) node.getOwnerDocument();
-		return document.getModel().getBaseLocation();		
-	}
-	
-	/**
-	 * @param newProposal
-	 */
-	protected void addMacro(ICompletionProposal newProposal) {
-		macros.add(newProposal);
-	}
-
-	protected void addProposal(ICompletionProposal newProposal) {
-		proposals.add(newProposal);
-	}
-
-	protected IStructuredDocumentRegion getDocumentRegion() {
-		return documentRegion;
-	}
-
-	protected List<ICompletionProposal> getMacros() {
-		return macros;
-	}
-
-	protected java.lang.String getMatchString() {
-		return matchString;
-	}
-
-	protected org.w3c.dom.Node getNode() {
-		return node;
-	}
-
-	protected org.w3c.dom.Node getParent() {
-		return node.getParentNode();
-	}
-
-	protected List<ICompletionProposal> getProposals() {
-		return proposals;
-	}
-
-	protected ITextRegion getRegion() {
-		return region;
-	}
-
-	protected int getReplacementBeginPosition() {
-		return replacementBeginPosition;
-	}
-
-	protected int getReplacementLength() {
-		return replacementLength;
-	}
-
-	protected int getStartOffset() {
-		if ((getDocumentRegion() != null) && (getRegion() != null)) {
-			return ((ITextRegionCollection) getDocumentRegion()).getStartOffset(getRegion());
-		}
-		return -1;
-	}
-
-	protected String getText() {
-		if ((getDocumentRegion() != null) && (getRegion() != null)) {
-			return ((ITextRegionCollection) getDocumentRegion()).getText(getRegion());
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	protected int getTextEndOffset() {
-		if ((getDocumentRegion() != null) && (getRegion() != null)) {
-			return ((ITextRegionCollection) getDocumentRegion()).getTextEndOffset(getRegion());
-		}
-		return -1;
-	}
-
-	protected void setDocumentRegion(IStructuredDocumentRegion region) {
-		documentRegion = region;
-	}
-
-	protected void setMatchString(java.lang.String newMatchString) {
-		matchString = newMatchString;
-	}
-
-	
-	protected void setNode(org.w3c.dom.Node newNode) {
-		node = newNode;
-	}
-
-
-	protected void setRegion(ITextRegion newRegion) {
-		region = newRegion;
-	}
-
-	protected void setReplacementBeginPosition(int newReplacementBeginPosition) {
-		replacementBeginPosition = newReplacementBeginPosition;
-	}
-
-
-	protected void setReplacementLength(int newReplacementLength) {
-		replacementLength = newReplacementLength;
-	}
-
-	protected ArrayList<ICompletionProposal> sortProposals(ArrayList<ICompletionProposal> proposalsIn) {
-		Collections.sort(proposalsIn, new ProposalComparator());
-		return proposalsIn;
-
-	}
-
-	/**
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String toString() {
-		return "Node: " + getNode() //$NON-NLS-1$
-					+ "\nParent: " + getParent() //$NON-NLS-1$
-					+ "\nStructuredDocumentRegion: " + StringUtils.escape(getDocumentRegion().toString()) //$NON-NLS-1$
-					+ "\nRegion: " + getRegion() //$NON-NLS-1$
-					+ "\nMatch string: '" + StringUtils.escape(getMatchString()) + "'" //$NON-NLS-2$//$NON-NLS-1$
-					+ "\nOffsets: [" + getReplacementBeginPosition() + "-" + (getReplacementBeginPosition() + getReplacementLength()) + "]\n"; //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	}
-
-	protected StylesheetModel getStylesheetModel() {
-		IFile editorFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(getLocation()));
-		StylesheetModel model = XSLCore.getInstance().getStylesheet(editorFile);
-		return model;
-	}
-	
-		
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/CallTemplateContentAssistRequest.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/CallTemplateContentAssistRequest.java
deleted file mode 100644
index 21a20b5..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/CallTemplateContentAssistRequest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- *Copyright (c) 2008 Standards in 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 243575 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-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.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.eclipse.wst.xsl.core.model.Template;
-import org.eclipse.wst.xsl.core.model.XSLAttribute;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImageHelper;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImages;
-import org.w3c.dom.Node;
-
-/**
- * CallTemplateContentAssistance provides content assist proposals for
- * <xsl:call-with> templates.   It will provide a list of all available
- * named templates.
- * 
- * @author David Carver
- *
- */
-public class CallTemplateContentAssistRequest extends
-		AbstractXSLContentAssistRequest {
-	
-	private static final String ATTR_MODE = "mode";
-	private static final String ATTR_NAME = "name";
-
-	/**
-	 * @param node
-	 * @param parent
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public CallTemplateContentAssistRequest(Node node, IStructuredDocumentRegion documentRegion,
-			ITextRegion completionRegion, int begin, int length, String filter,
-			ITextViewer textViewer) {
-		super(node, documentRegion, completionRegion, begin, length,
-				filter, textViewer);
-		// TODO Auto-generated constructor stub
-	}
-	
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest#getCompletionProposals()
-	 */
-	@Override
-	public ArrayList<ICompletionProposal> getCompletionProposals() {
-		proposals.clear();
-		
-		IFile editorFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(getLocation()));
-		
-		StylesheetModel model = XSLCore.getInstance().getStylesheet(editorFile);
-
-		List<Template> templates = model.getTemplates();
-		
-		for (Template template : templates) {
-			XSLAttribute attribute = template.getAttribute(ATTR_NAME);
-			if (attribute != null) {
-				String proposalInfo = getAdditionalInfo(template);
-				CustomCompletionProposal proposal = new CustomCompletionProposal(
-						attribute.getValue(), getStartOffset() + 1, 0,
-						attribute.getValue().length(), XSLPluginImageHelper
-								.getInstance().getImage(
-										XSLPluginImages.IMG_TEMPLATE), attribute
-								.getValue(), null, proposalInfo, 0);
-				addProposal(proposal);
-			}
-		}
-		return getAllCompletionProposals();
-	}
-	
-	protected String getAdditionalInfo(Template template) {
-		XSLAttribute nameAttribute = template.getAttribute(ATTR_NAME);
-		
-		String proposalInfo = "Template Name: " + nameAttribute.getValue() +
-		                      "\r\n" + "File:" + template.getStylesheet().getFile().getName();
-		
-		return proposalInfo;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/CustomCompletionProposal.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/CustomCompletionProposal.java
deleted file mode 100644
index 37a5e8a..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/CustomCompletionProposal.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension4;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-
-public class CustomCompletionProposal extends
-		org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal
-		implements ICompletionProposalExtension4 {
-
-	/**
-	 * @param replacementString
-	 * @param replacementOffset
-	 * @param replacementLength
-	 * @param cursorPosition
-	 * @param image
-	 * @param displayString
-	 * @param contextInformation
-	 * @param additionalProposalInfo
-	 * @param relevance
-	 */
-	public CustomCompletionProposal(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);
-	}
-
-	/**
-	 * @param replacementString
-	 * @param replacementOffset
-	 * @param replacementLength
-	 * @param cursorPosition
-	 * @param image
-	 * @param displayString
-	 * @param contextInformation
-	 * @param additionalProposalInfo
-	 * @param relevance
-	 * @param updateReplacementLengthOnValidate
-	 */
-	public CustomCompletionProposal(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);
-	}
-
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension4#isAutoInsertable()
-	 */
-	public boolean isAutoInsertable() {
-		return true;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/ElementContentAssistRequest.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/ElementContentAssistRequest.java
deleted file mode 100644
index 4df8b40..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/ElementContentAssistRequest.java
+++ /dev/null
@@ -1,414 +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 244978 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.graphics.Image;
-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.util.Debug;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAction;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-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.XMLRelevanceConstants;
-import org.eclipse.wst.xml.ui.internal.editor.CMImageUtil;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-import org.eclipse.wst.xml.ui.internal.taginfo.MarkupTagInfoProvider;
-import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper;
-import org.eclipse.wst.xsl.ui.internal.contentassist.contentmodel.XSLContentModelGenerator;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * This class provides content assistance proposals outside of the XSL namespace.  Normal
- * XML editor content assistance only provides proposals for items within the same namespace
- * or if an element has children elements.   This class extends this functionality by checking
- * for the first XSL ancestor and uses that to determine what proposals should be
- * provided in the way of xsl elements.
- * 
- * @author David Carver
- * @since 1.0
- */
-public class ElementContentAssistRequest extends
-		AbstractXSLContentAssistRequest {
-
-	private XSLContentModelGenerator contentModel;
-	private static final String XPATH_FIRST_XSLANCESTOR_NODE = "ancestor::xsl:*[1]";
-	private MarkupTagInfoProvider infoProvider = null;
-
-	/**
-	 * @param node
-	 * @param parent
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public ElementContentAssistRequest(Node node,
-			IStructuredDocumentRegion documentRegion,
-			ITextRegion completionRegion, int begin, int length, String filter,
-			ITextViewer textViewer) {
-		super(node, documentRegion, completionRegion, begin, length,
-				filter, textViewer);
-		contentModel = new XSLContentModelGenerator();
-	}
-
-	/**
-	 * Provides a list of possible proposals for the XSL Elements within the current
-	 * scope.
-	 */
-	@Override
-	public ArrayList<ICompletionProposal> getCompletionProposals() {
-
-		if (region.getType() == DOMRegionContext.XML_TAG_OPEN) {
-			computeTagOpenProposals();
-		} else if (region.getType() == DOMRegionContext.XML_TAG_NAME) {
-			computeTagNameProposals();
-		}
-		return getAllCompletionProposals();
-	}
-
-	/**
-	 * Calculate proposals for open content regions.
-	 */
-	protected void computeTagOpenProposals() {
-
-		if (replacementBeginPosition == documentRegion.getStartOffset(region)) {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				// at the start of an existing tag, right before the '<'
-				computeTagNameProposals();
-			}
-		} else {
-			// within the white space
-			ITextRegion name = getNameRegion(((IDOMNode) node)
-					.getStartStructuredDocumentRegion());
-			if ((name != null)
-					&& ((documentRegion.getStartOffset(name) <= replacementBeginPosition) && (documentRegion
-							.getEndOffset(name) >= replacementBeginPosition))) {
-				// replace the existing name
-				replacementBeginPosition = documentRegion.getStartOffset(name);
-				replacementLength = name.getTextLength();
-			} else {
-				// insert a valid new name, or possibly an end tag
-				// addEndTagProposals(contentAssistRequest);
-				setReplacementLength(0);
-			}
-			addTagNameProposals(getElementPosition(node));
-		}
-	}
-
-	/**
-	 * Calculates the proposals for the XML Tag Name Region.
-	 */
-	protected void computeTagNameProposals() {
-		// completing the *first* tag in "<tagname1 |<tagname2"
-		
-		// Ignore attributes
-		if (inAttributeRegion()) {
-			return;
-		}
-		
-		IDOMNode actualNode = (IDOMNode) node;
-		addTagNameProposals(this.getElementPosition(node));
-		// addEndTagNameProposals();
-
-	}
-
-	/**
-	 * Check to see if the current position is in an Attribute Region if so,
-	 * return true otherwise false
-	 * @return True if in attribute region, false otherwise.
-	 */
-	protected boolean inAttributeRegion() {
-		return replacementBeginPosition > documentRegion.getStartOffset(region) + region.getLength();
-	}
-
-	/**
-	 * Adds proposals for the XML_TAG_NAME region.
-	 * @param position
-	 */
-	protected void addTagNameProposals(int position) {
-
-		Node ancestorNode = null;
-		try {
-			ancestorNode = XSLTXPathHelper.selectSingleNode(getNode(),
-					XPATH_FIRST_XSLANCESTOR_NODE);
-		} catch (Exception ex) {
-			return;
-		}
-
-		List<CMNode> cmnodes = null;
-
-		if (ancestorNode.getNodeType() == Node.ELEMENT_NODE) {
-			cmnodes = getAvailableChildElementDeclarations(
-					(Element) ancestorNode, 0);
-			Iterator<CMNode> nodeIterator = cmnodes.iterator();
-			// chop off any leading <'s and whitespace from the matchstring
-			while ((matchString.length() > 0)
-					&& (Character.isWhitespace(matchString.charAt(0)) || beginsWith(
-							matchString, "<"))) {
-				//$NON-NLS-1$
-				matchString = matchString.substring(1);
-			}
-			if (!nodeIterator.hasNext()) {
-				return;
-			}
-			while (nodeIterator.hasNext()) {
-				CMNode elementDecl = (CMNode) nodeIterator.next();
-				if (elementDecl != null) {
-					// only add proposals for the child element's that begin
-					// with the matchstring
-					String proposedText = null;
-
-					proposedText = contentModel.getRequiredName(ancestorNode,
-							elementDecl);
-					int cursorAdjustment = proposedText.length();
-
-					if (elementDecl instanceof CMElementDeclaration) {
-						CMElementDeclaration ed = (CMElementDeclaration) elementDecl;
-						if (ed.getContentType() == CMElementDeclaration.EMPTY) {
-							proposedText += contentModel.getStartTagClose(
-									ancestorNode, ed);
-							cursorAdjustment = proposedText.length();
-						} else {
-							StringBuffer sb = new StringBuffer();
-							contentModel.generateTag(ancestorNode, ed, sb);
-							// since it's a name proposal, assume '<' is
-							// already there
-							// only return the rest of the tag
-							proposedText = sb.toString().substring(1);
-							cursorAdjustment = getCursorPositionForProposedText(proposedText);
-
-						}
-					}
-					if (beginsWith(proposedText, matchString)) {
-						Image image = CMImageUtil.getImage(elementDecl);
-						if (image == null) {
-							image = XMLEditorPluginImageHelper
-									.getInstance()
-									.getImage(
-											XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
-						}
-						String proposedInfo = getAdditionalInfo(
-								getCMElementDeclaration(getParent()), elementDecl);
-						CustomCompletionProposal proposal = new CustomCompletionProposal(
-								proposedText, getReplacementBeginPosition(),
-								getReplacementLength(), cursorAdjustment,
-								image, contentModel.getRequiredName(getParent(),
-										elementDecl), null, proposedInfo,
-								XMLRelevanceConstants.R_TAG_NAME);
-						addProposal(proposal);
-					}
-				}
-			}
-		}
-
-	}
-
-
-	/** Returns a list of CMNodes that are available within this parent context
-	 * Given the grammar shown below and a snippet of XML code (where the '|'
-	 * indicated the cursor position)
-	 * the list would return all of the element declarations that are
-	 * potential child elements of Foo.
-	 *
-	 * grammar : Foo -> (A, B, C)
-	 * snippet : <Foo><A>|
-	 * result : {A, B, C}
-	 * 
-	 * @param parent
-	 * @param childPosition
-	 * @return
-	 */
-	protected List<CMNode> getAvailableChildElementDeclarations(Element parent,
-			int childPosition) {
-		List modelQueryActions = getAvailableChildrenAtIndex(parent,
-				childPosition, ModelQuery.VALIDITY_NONE);
-		Iterator iterator = modelQueryActions.iterator();
-		List<CMNode> cmnodes = new Vector();
-		while (iterator.hasNext()) {
-			ModelQueryAction action = (ModelQueryAction) iterator.next();
-			if ((childPosition < 0)
-					|| (((action.getStartIndex() <= childPosition) && (childPosition <= action
-							.getEndIndex())))) {
-				CMNode actionCMNode = action.getCMNode();
-				if ((actionCMNode != null) && !cmnodes.contains(actionCMNode)) {
-					cmnodes.add(actionCMNode);
-				}
-			}
-		}
-		return cmnodes;
-	}
-
-	// returns a list of ModelQueryActions
-	protected List getAvailableChildrenAtIndex(Element parent, int index,
-			int validityChecking) {
-		List list = new ArrayList();
-		CMElementDeclaration parentDecl = getCMElementDeclaration(parent);
-		if (parentDecl != null) {
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(parent
-					.getOwnerDocument());
-			// taken from ActionManagers
-			// int editMode = modelQuery.getEditMode();
-			int editMode = ModelQuery.EDIT_MODE_UNCONSTRAINED;
-			int ic = (editMode == ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) ? ModelQuery.INCLUDE_CHILD_NODES
-					| ModelQuery.INCLUDE_SEQUENCE_GROUPS
-					: ModelQuery.INCLUDE_CHILD_NODES;
-			modelQuery.getInsertActions(parent, parentDecl, index, ic,
-					validityChecking, list);
-		}
-		return list;
-	}
-
-	protected CMElementDeclaration getCMElementDeclaration(Node node) {
-		CMElementDeclaration result = null;
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(node
-					.getOwnerDocument());
-			if (modelQuery != null) {
-				result = modelQuery.getCMElementDeclaration((Element) node);
-			}
-		}
-		return result;
-	}
-
-	protected int getElementPosition(Node child) {
-		Node parent = child.getParentNode();
-		if (parent == null) {
-			return 0;
-		}
-
-		NodeList children = parent.getChildNodes();
-		if (children == null) {
-			return 0;
-		}
-		int count = 0;
-
-		for (int i = 0; i < children.getLength(); i++) {
-			if (children.item(i) == child) {
-				return count;
-			} else {
-				// if (children.item(i).getNodeType() == Node.ELEMENT_NODE)
-				count++;
-			}
-		}
-		return 0;
-	}
-
-	/**
-	 * Retreives cmnode's documentation to display in the completion proposal's
-	 * additional info. If no documentation exists for cmnode, try displaying
-	 * parentOrOwner's documentation
-	 * 
-	 * String any documentation information to display for cmnode.
-	 * <code>null</code> if there is nothing to display.
-	 */
-	protected String getAdditionalInfo(CMNode parentOrOwner, CMNode cmnode) {
-		String addlInfo = null;
-
-		if (cmnode == null) {
-			if (Debug.displayWarnings) {
-				new IllegalArgumentException("Null declaration!").printStackTrace(); //$NON-NLS-1$
-			}
-			return null;
-		}
-
-		addlInfo = getInfoProvider().getInfo(cmnode);
-		if ((addlInfo == null) && (parentOrOwner != null)) {
-			addlInfo = getInfoProvider().getInfo(parentOrOwner);
-		}
-		return addlInfo;
-	}
-
-	/**
-	 * Gets the infoProvider.
-	 * 
-	 * fInfoProvider and if fInfoProvider was <code>null</code> create a new
-	 * instance
-	 */
-	public MarkupTagInfoProvider getInfoProvider() {
-		if (infoProvider == null) {
-			infoProvider = new MarkupTagInfoProvider();
-		}
-		return infoProvider;
-	}
-
-	protected boolean beginsWith(String aString, String prefix) {
-		if ((aString == null) || (prefix == null)) {
-			return true;
-		}
-		return aString.toLowerCase().startsWith(prefix.toLowerCase());
-	}
-
-	/**
-	 * This is the position the cursor should be in after the proposal is
-	 * applied
-	 * 
-	 * @param proposedText
-	 * @return the position the cursor should be in after the proposal is
-	 *         applied
-	 */
-	private int getCursorPositionForProposedText(String proposedText) {
-		int cursorAdjustment;
-		cursorAdjustment = proposedText.indexOf("\"\"") + 1; //$NON-NLS-1$
-		// otherwise, after the first tag
-		if (cursorAdjustment == 0) {
-			cursorAdjustment = proposedText.indexOf('>') + 1;
-		}
-		if (cursorAdjustment == 0) {
-			cursorAdjustment = proposedText.length() + 1;
-		}
-
-		return cursorAdjustment;
-	}
-
-	protected ITextRegion getNameRegion(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null) {
-			return null;
-		}
-		Iterator regionList = flatNode.getRegions().iterator();
-		while (regionList.hasNext()) {
-			ITextRegion region = (ITextRegion) regionList.next();
-			if (isNameRegion(region)) {
-				return region;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Checks to the see if the element is in the correct region.
-	 * @param region
-	 * @return
-	 */
-	protected boolean isNameRegion(ITextRegion region) {
-		String type = region.getType();
-		return ((type == DOMRegionContext.XML_TAG_NAME)
-				|| (type == DOMRegionContext.XML_ELEMENT_DECL_NAME)
-				|| (type == DOMRegionContext.XML_DOCTYPE_NAME) || (type == DOMRegionContext.XML_ATTLIST_DECL_NAME));
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/ExcludeResultPrefixesContentAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/ExcludeResultPrefixesContentAssist.java
deleted file mode 100644
index 4290966..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/ExcludeResultPrefixesContentAssist.java
+++ /dev/null
@@ -1,119 +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 230136 - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-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.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImageHelper;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImages;
-import org.w3c.dom.Node;
-
-/**
- * Provides content assistance for xsl elements that have the
- * exclude-result-prefixes attribute.  This will provide a list 
- * of all known result prefixes that aren't currently in the attribute
- * list.  This list is a space separated list.   The XSL prefix is
- * excluded.
- * 
- * @author dcarver
- * @since 1.0
- * 
- */
-public class ExcludeResultPrefixesContentAssist extends AbstractXSLContentAssistRequest {
-	private static final String EXCLUDE_RESULT_PREFIXES = "exclude-result-prefixes"; //$NON-NLS-1$
-	private static final String DEFAULT = "#all"; //$NON-NLS-1$
-	private static final String ADDITIONAL_INFO = Messages.getString("ExcludeResultPrefixesContentAssist.2"); //$NON-NLS-1$
-	protected String[] tokens = null;
-
-	/**
-	 * @param node
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public ExcludeResultPrefixesContentAssist(Node node,
-			IStructuredDocumentRegion documentRegion,
-			ITextRegion completionRegion, int begin, int length, String filter,
-			ITextViewer textViewer) {
-		super(node, documentRegion, completionRegion, begin, length, filter, textViewer);
-	}
-	
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest#getCompletionProposals()
-	 */
-	@Override
-	public ArrayList<ICompletionProposal> getCompletionProposals() {
-		 proposals.clear();
-		 
-		 IDOMAttr attrNode = (IDOMAttr)((IDOMElement)getNode()).getAttributeNode(EXCLUDE_RESULT_PREFIXES);
-		 String excludeResultPrefixes = attrNode.getValue();
-		 int offset = getCursorPosition();
-		 
-		 if (excludeResultPrefixes == null || excludeResultPrefixes.equals(DEFAULT)) {
-			 return getAllCompletionProposals();
-		 }
-		 
-		 tokens = excludeResultPrefixes.split("\\s"); //$NON-NLS-1$
-		 if (tokens[0].equals("")) { //$NON-NLS-1$
-			 CustomCompletionProposal proposal = new CustomCompletionProposal(
-						DEFAULT, offset, 0, DEFAULT.length(),
-						XSLPluginImageHelper.getInstance().getImage(XSLPluginImages.IMG_PREFIX),
-						DEFAULT, null, null, 0);
-			 addProposal(proposal);
-		 }
-		 Collection<NamespaceInfo> namespaces = this.getNamespaces((IDOMElement)node);
-		 for (NamespaceInfo namespace : namespaces) {
-			 
-			 if (includePrefix(namespace)) { 
-				 CustomCompletionProposal proposal = new CustomCompletionProposal(
-							namespace.prefix, offset, 0, namespace.prefix.length(),
-							XSLPluginImageHelper.getInstance().getImage(XSLPluginImages.IMG_PREFIX),
-							namespace.prefix, null, namespace.uri, 0);
-				 addProposal(proposal);
-			 }
-		 }
-		 
-		return getAllCompletionProposals();
-	}
-
-	protected boolean includePrefix(NamespaceInfo namespace) {
-		return !prefixExists(namespace.prefix) && !namespace.prefix.equals("") && !namespace.uri.equals(XSLCore.XSL_NAMESPACE_URI); //$NON-NLS-1$
-	}
-	
-	
-	protected boolean prefixExists(String prefix) {
-		if (tokens == null || tokens.length == 0) {
-			return false;
-		}
-		for (int cnt = 0; cnt < tokens.length; cnt++) {
-			if (prefix.equals(tokens[cnt])) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/HrefContentAssistRequest.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/HrefContentAssistRequest.java
deleted file mode 100644
index 70efa52..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/HrefContentAssistRequest.java
+++ /dev/null
@@ -1,209 +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.contentassist;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-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.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-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.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImageHelper;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImages;
-import org.w3c.dom.Node;
-
-/**
- * <p>This provides content assistance proposals for href attributes with a mode attribute.</p>
- * <p>Content assistance is restricted to files with the XSL content type that are in the same project as the file currently 
- * being edited. This is because projects in the workspace can have completely different physical file locations, leading to 
- * confusion in relative file paths across projects. Similarly, no content assistance is given for files external to the workspace. 
- * Such files should be assigned an absolute 'file:///' URL.</p>
- * 
- * @author Doug Satchwell
- * @since 1.0
- */
-public class HrefContentAssistRequest extends AbstractXSLContentAssistRequest
-{
-	private List<IPath> pathList = new ArrayList<IPath>();
-
-	private final class PathComparator implements Comparator<IPath>
-	{
-		public int compare(IPath o1, IPath o2)
-		{
-			int countComp = o1.segmentCount() - o2.segmentCount();
-			if (countComp != 0)
-				return countComp;
-			
-			for(int i=0;i<o1.segmentCount();i++)
-			{
-				String seg1 = o1.segment(i);
-				String seg2 = o2.segment(i);
-				if (!seg1.equals(seg2))
-				{
-					if (seg1.equals(".."))
-						return 1;
-					if (seg2.equals(".."))
-						return -1;
-				}
-			}
-			
-			return o1.toString().compareTo(o2.toString());
-		}
-	}
-
-	private final class XSLFileResourceVisitor implements IResourceVisitor
-	{
-		private final String precedingText;
-		private final IFile editorFile;
-
-		private XSLFileResourceVisitor(IFile editorFile, String precedingText)
-		{
-			this.precedingText = precedingText;
-			this.editorFile = editorFile;
-		}
-
-		public boolean visit(IResource resource) throws CoreException
-		{
-			if (resource.getType() == IResource.FILE)
-			{
-				IFile file = (IFile)resource;
-				if (XSLCore.isXSLFile(file) && !file.equals(editorFile))
-				{
-					IPath path = getRelativePath(editorFile, file);
-					if (path.toString().startsWith(precedingText))
-					{
-						pathList.add(path);
-					}
-				}
-			}
-			return true;
-		}
-	}
-
-	/**
-	 * Constructor for creating the HrefContentAssistRequest class.
-	 * 
-	 * @param node
-	 * @param parent
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public HrefContentAssistRequest(Node node, IStructuredDocumentRegion documentRegion, ITextRegion completionRegion, int begin, int length, String filter, ITextViewer textViewer)
-	{
-		super(node, documentRegion, completionRegion, begin, length, filter, textViewer);
-	}
-
-	/**
-	 * The main method that returns an array of proposals. Returns relative paths to files in the current project.
-	 * 
-	 * @return ICompletionProposal[] 
-	 * @see org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest#getCompletionProposals()
-	 */
-	@Override
-	public ArrayList<ICompletionProposal> getCompletionProposals()
-	{
-		pathList.clear();
-		proposals.clear();
-		
-		try
-		{
-			String text = getText();
-			String precedingText;
-			
-			int length = getCursorPosition()-getStartOffset();
-			if (length > 0 && text.length() > length + 1)
-				precedingText = text.substring(1,length);
-			else
-				precedingText = "";
-			IFile editorFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(getLocation()));
-			editorFile.getProject().accept(new XSLFileResourceVisitor(editorFile,precedingText));
-
-			Collections.sort(pathList,new PathComparator());
-			for (IPath path : pathList)
-			{
-				String pathString = path.toString();
-				CustomCompletionProposal proposal = new CustomCompletionProposal(
-						pathString,
-						getStartOffset() + 1,
-						text.length()-2,
-						pathString.length(),
-						XSLPluginImageHelper.getInstance().getImage(XSLPluginImages.IMG_XSL_FILE),
-						pathString,
-						null, 
-						null, 
-						0,
-						true
-					);
-				proposals.add(proposal);
-			}
-		}
-		catch (CoreException e)
-		{
-			XSLUIPlugin.log(e);
-		}
-
-		return proposals;
-	}
-	
-	/**
-	 * Do not wish to sort the proposals - they are already sorted
-	 * 
-	 * @return the same list, in the same order
-	 */
-	protected List<ICompletionProposal> sortProposals(List<ICompletionProposal> proposalsIn) {
-		return proposalsIn;
-	}
-
-	private IPath getRelativePath(IFile relativeTo, IFile file)
-	{
-		IPath filePath = file.getFullPath();
-		IPath relativeToPath = relativeTo.getFullPath();
-		
-		IPath relPath;
-		if (filePath.segmentCount() > relativeToPath.segmentCount())
-		{
-			relPath = filePath.removeFirstSegments(filePath.matchingFirstSegments(relativeToPath));
-		}
-		else if (filePath.segmentCount() < relativeToPath.segmentCount())
-		{
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < relativeToPath.segmentCount() - filePath.segmentCount(); i++)
-			{
-				sb.append("../");
-			}
-			sb.append(file.getName());
-			relPath = new Path(sb.toString());
-		}
-		else
-		{
-			relPath = new Path(file.getName());
-		}
-		return relPath;
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/IContentAssistProposalRequest.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/IContentAssistProposalRequest.java
deleted file mode 100644
index d294d1a..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/IContentAssistProposalRequest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-/**
- * Provides content assistance ICompletionProposals.
- * 
- * @author David Carver
- *
- */
-public interface IContentAssistProposalRequest {
-
-	/**
-	 * Completion Proposals for a Content Assist Request.
-	 * @return
-	 */
-	public ArrayList<ICompletionProposal> getCompletionProposals();
-}
\ No newline at end of file
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/NullContentAssistRequest.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/NullContentAssistRequest.java
deleted file mode 100644
index b78b7bf..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/NullContentAssistRequest.java
+++ /dev/null
@@ -1,53 +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 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.w3c.dom.Node;
-
-/**
- * An empty content assist request.
- * @author dcarver
- *
- */
-public class NullContentAssistRequest extends AbstractXSLContentAssistRequest {
-	private ArrayList<ICompletionProposal> emptyProposals = new ArrayList<ICompletionProposal>();
-
-	/**
-	 * A NULL ContentAssistRequest has no proposals.
-	 * @param node
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public NullContentAssistRequest(Node node, 
-			IStructuredDocumentRegion documentRegion,
-			ITextRegion completionRegion, int begin, int length, String filter,
-			ITextViewer textViewer) {
-		super(node, documentRegion, completionRegion, begin, length,
-				filter, textViewer);
-		// TODO Auto-generated constructor stub
-	}
-	
-	@Override
-	public ArrayList<ICompletionProposal> getCompletionProposals() {
-		return emptyProposals;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java
deleted file mode 100644
index 76f4c67..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java
+++ /dev/null
@@ -1,247 +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 240170 - 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.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xsl.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.xpath.core.internal.parser.XPathParser;
-import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper;
-import org.eclipse.wst.xml.xpath.ui.internal.contentassist.XPathTemplateCompletionProcessor;
-import org.eclipse.wst.xml.xpath.ui.internal.templates.TemplateContextTypeIdsXPath;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImageHelper;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImages;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-/**
- * This class provides content assistance for the XSL select attribute.
- * 
- * @author dcarver
- *
- */
-public class SelectAttributeContentAssist extends AbstractXSLContentAssistRequest {
-	
-	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$
-
-	private XPathTemplateCompletionProcessor fTemplateProcessor = null;
-	private List<String> fTemplateContexts = new ArrayList<String>();
-	private static final byte[] XPATH_LOCK = new byte[0];
-
-	/**
-	 * Handles Content Assistance requests for Select Attributes.  This is called an instantiated
-	 * through the use of the computeProposals method from the XSLContentAssistProcessor.  It will
-	 * calculate the available proposals that are available for the XSL select attribute.
-	 * 
-	 * @param node
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public SelectAttributeContentAssist(Node node,
-			IStructuredDocumentRegion documentRegion,
-			ITextRegion completionRegion, int begin, int length, String filter,
-			ITextViewer textViewer) {
-		super(node, documentRegion, completionRegion, begin, length, filter, textViewer);
-		// TODO Auto-generated constructor stub
-	}
-
-	
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest#getCompletionProposals()
-	 */
-	@Override
-	public ArrayList<ICompletionProposal> getCompletionProposals() {
-		proposals.clear();
-		
-		adjustXPathStart();
-		
-		int offset = getReplacementBeginPosition();
-		IDOMAttr attrNode = (IDOMAttr)((IDOMElement)getNode()).getAttributeNode("select");
-		
-		this.matchString = extractXPathMatchString(attrNode, getRegion(), getReplacementBeginPosition());
-		
-	    addSelectProposals((Element)getNode().getParentNode(), offset);
-
-		return  getAllCompletionProposals();
-    }
-	
-	
-
-	/**
-	 *  This needs to setup the content assistance correctly. Here is what needs to happen:
-	 *  1. Adjust the matchString (This should have been calculated earlier) 
-	 *  2. Get the current tokens offset position..this will be the starting offset.
-	 *  3. Get the replacement length...this is the difference between the token offset and the next token or end of the string
-	 */
-	protected void adjustXPathStart() {
-	    IDOMElement elem = (IDOMElement)getNode();
-	    IDOMAttr xpathNode = (IDOMAttr)elem.getAttributeNode("select");
-		
-		if (xpathNode != null) {
-			XPathParser parser = new XPathParser(xpathNode.getValue());
-			int startOffset = xpathNode.getValueRegionStartOffset() + parser.getTokenStartOffset(1, getReplacementBeginPosition() - xpathNode.getValueRegionStartOffset()) - 1;
-			replacementLength = getReplacementBeginPosition() - startOffset;
-		}
-	}
-		
-	protected String extractXPathMatchString(IDOMAttr node, ITextRegion aRegion, int offset) {
-		if (node == null || node.getValue().length() == 0)	return "";
-		
-		if (matchString.length() == 1) {
-			return matchString;
-		}
-		
-		int column = offset - node.getValueRegionStartOffset() - 1;
-		String nodeValue = node.getValue();
-		XPathParser parser = new XPathParser(nodeValue);
-		int tokenStart = parser.getTokenStartOffset(1, column);
-		
-		if (tokenStart >= column) {
-			return "";
-		}
-		
-		return node.getValue().substring(tokenStart - 1, column);
-	}
-
-
-	protected void addSelectProposals(Element rootElement, int offset) {
-			addGlobalProposals(rootElement, offset);
-			addLocalProposals(getNode(), offset);
-			addTemplates(TemplateContextTypeIdsXPath.AXIS, offset);
-			addTemplates(TemplateContextTypeIdsXPath.XPATH, offset);
-			addTemplates(TemplateContextTypeIdsXPath.CUSTOM, offset);
-			addTemplates(TemplateContextTypeIdsXPath.OPERATOR, offset);
-	}
-	
-	/**
-	 * Adds XPath related templates to the list of proposals
-	 * 
-	 * @param contentAssistRequest
-	 * @param context
-	 * @param startOffset
-	 */
-	protected void addTemplates(String context, int startOffset) {
-
-		if (!fTemplateContexts.contains(context)) {
-			fTemplateContexts.add(context);
-			
-			if (getTemplateCompletionProcessor() != null) {
-				getTemplateCompletionProcessor().setContextType(context);
-				ICompletionProposal[] proposals = getTemplateCompletionProcessor()
-						.computeCompletionProposals(textViewer, startOffset);
-				for (int i = 0; i < proposals.length; ++i) {
-					ICompletionProposal proposal = proposals[i];
-					if (matchString.length() > 0) {
-						if (proposal.getDisplayString().startsWith(matchString) ) {
-							addProposal(proposals[i]);
-						}
-					} else {
-						addProposal(proposals[i]);
-					}
-				}
-			}
-		}
-	}
-	
-
-
-	private void addLocalProposals(Node xpathnode, int offset) {
-		addVariablesProposals(XPATH_LOCAL_VARIABLES, xpathnode, offset);
-		addVariablesProposals(XPATH_LOCAL_PARAMS, xpathnode, offset);
-	}
-
-	private void addGlobalProposals(Node xpathnode, int offset) {
-		addVariablesProposals(XPATH_GLOBAL_VARIABLES, xpathnode, offset);
-		addVariablesProposals(XPATH_GLOBAL_PARAMS, xpathnode, offset);
-	}
-
-	/**
-	 * 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, int offset) {
-		synchronized (XPATH_LOCK) {
-			try {
-				NodeList nodes = XSLTXPathHelper.selectNodeList(xpathnode, xpath);
-				int startLength = getCursorPosition() - offset;
-
-				if (hasNodes(nodes)) {
-					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$
-						CustomCompletionProposal proposal = new CustomCompletionProposal(
-								variableName, offset, 0, startLength + variableName.length(),
-								XSLPluginImageHelper.getInstance().getImage(XSLPluginImages.IMG_VARIABLES),
-								variableName, null, null, 0);
-						
-						if (matchString.length() > 0) {
-							if (proposal.getDisplayString().startsWith(matchString)) {
-								addProposal(proposal);
-							}
-						} else {
-							addProposal(proposal);
-						}
-					}
-				}
-
-			} catch (TransformerException ex) {
-				XSLUIPlugin.log(ex);
-			}
-		}
-	}
-
-	private XPathTemplateCompletionProcessor getTemplateCompletionProcessor() {
-		if (fTemplateProcessor == null) {
-			fTemplateProcessor = new XPathTemplateCompletionProcessor();
-		}
-		return fTemplateProcessor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TemplateModeAttributeContentAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TemplateModeAttributeContentAssist.java
deleted file mode 100644
index 2332b5a..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TemplateModeAttributeContentAssist.java
+++ /dev/null
@@ -1,103 +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 243578  - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-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.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.eclipse.wst.xsl.core.model.Template;
-import org.eclipse.wst.xsl.core.model.XSLAttribute;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImageHelper;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImages;
-import org.w3c.dom.Node;
-
-/**
- * TemplateModeAttributeContentAssist provides content assistance proposals for
- * <xsl:templates> with a mode attribute.   It looks at all the modes defined
- * within the xsl model, and pulls out any modes that have been defined.
- * @author dcarver
- * @since 1.0
- */
-public class TemplateModeAttributeContentAssist extends
-		AbstractXSLContentAssistRequest {
-
-	/**
-	 * Constructor for creating the TemplateMode Content Assistance class.
-	 * 
-	 * @param node
-	 * @param parent
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public TemplateModeAttributeContentAssist(Node node,
-			IStructuredDocumentRegion documentRegion,
-			ITextRegion completionRegion, int begin, int length, String filter,
-			ITextViewer textViewer) {
-		super(node, documentRegion, completionRegion, begin, length,
-				filter, textViewer);
-	}
-
-	/**
-	 * The main method that returns an array of proposals. Returns the available
-	 * modes that have been defined in the {@link StylesheetModel}.  If no proposals
-	 * are found it returns a NULL value.
-	 * @return ICompletionPropsal[] 
-	 * @see org.eclipse.wst.xml.ui.internal.contentassist.ContentAssistRequest#getCompletionProposals()
-	 */
-	@Override
-	public ArrayList<ICompletionProposal> getCompletionProposals() {
-		proposals.clear();
-		
-		StylesheetModel model = getStylesheetModel();
-
-		addModeProposals(model);
-		return getAllCompletionProposals();
-	}
-
-	/**
-	 * @param model
-	 */
-	protected void addModeProposals(StylesheetModel model) {
-		List<Template> templates = model.getTemplates();
-		ArrayList<String> modes = new ArrayList<String>();
-		
-		for (Template template : templates) {
-			XSLAttribute attribute = template.getAttribute("mode");
-			IDOMNode xmlNode = (IDOMNode)node;
-
-			if (attribute != null && xmlNode.getStartOffset() != template.getOffset()) {
-				CustomCompletionProposal proposal = new CustomCompletionProposal(
-						attribute.getValue(), getStartOffset() + 1, 0,
-						attribute.getValue().length(), XSLPluginImageHelper
-								.getInstance().getImage(
-										XSLPluginImages.IMG_MODE), attribute
-								.getValue(), null, null, 0);
-				if (modes.indexOf(attribute.getValue()) == -1) {
-					proposals.add(proposal);
-					modes.add(attribute.getValue());
-				}
-			}
-		}
-		modes.clear();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TemplateNameAttributeContentAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TemplateNameAttributeContentAssist.java
deleted file mode 100644
index 8125af9..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TemplateNameAttributeContentAssist.java
+++ /dev/null
@@ -1,99 +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 243577 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-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.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xsl.core.model.CallTemplate;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImageHelper;
-import org.eclipse.wst.xsl.ui.internal.util.XSLPluginImages;
-import org.w3c.dom.Node;
-
-/**
- * Provides content assistance for XSLT Named Templates.   It provides a list
- * of available call-template names that have already been used with in the
- * stylesheet.
- * 
- * @author David Carver
- * @since 1.0
- */
-public class TemplateNameAttributeContentAssist extends AbstractXSLContentAssistRequest {
-
-	private static final String ATTR_NAME = "name";
-
-	/**
-	 * Provides content assistance for XSLT Named Templates.  Will provide a list
-	 * of proposals based on the available named-templates if any are defined in
-	 * the XSL Stylesheet model.   Only provides a list of named templates that haven't already
-	 * been added as a proposal.  Does not check to see if it's already is defined in the current stylesheet.
-	 * @param node
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public TemplateNameAttributeContentAssist(Node node,
-			IStructuredDocumentRegion documentRegion,
-			ITextRegion completionRegion, int begin, int length, String filter,
-			ITextViewer textViewer) {
-		super(node, documentRegion, completionRegion, begin, length, filter, textViewer);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.xsl.ui.internal.contentassist.AbstractXSLContentAssistRequest#getCompletionProposals()
-	 */
-	@Override
-	public ArrayList<ICompletionProposal> getCompletionProposals() {
-		proposals.clear();
-		
-		StylesheetModel model = getStylesheetModel();
-		List<CallTemplate> templates = model.getCallTemplates();
-		
-		for (CallTemplate template : templates) {
-			CustomCompletionProposal proposal = createProposal(template);
-			addUniqueProposal(proposal);
-		}
-		
-		return getAllCompletionProposals();
-	}
-
-	private void addUniqueProposal(CustomCompletionProposal proposal) {
-		if (proposals.lastIndexOf(proposal) == -1) {
-			if (matchString.length() > 0) {
-				if (proposal.getDisplayString().startsWith(matchString)) {
-					addProposal(proposal);
-				}
-			} else {
-				addProposal(proposal);
-			}
-		}
-	}
-
-	private CustomCompletionProposal createProposal(CallTemplate template) {
-		CustomCompletionProposal proposal = new CustomCompletionProposal(
-				template.getAttributeValue(ATTR_NAME), getStartOffset() + 1, 0,
-				template.getAttributeValue(ATTR_NAME).length(), XSLPluginImageHelper
-						.getInstance().getImage(
-								XSLPluginImages.IMG_TEMPLATE), template
-						.getAttributeValue(ATTR_NAME), null, null, 0);
-		return proposal;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TestAttributeContentAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TestAttributeContentAssist.java
deleted file mode 100644
index 971ebb4..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TestAttributeContentAssist.java
+++ /dev/null
@@ -1,89 +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 240170 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.xpath.core.internal.parser.XPathParser;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * This class provides content assistance for the xsl <emphasis>test</emphais> attribute.
- *  
- * @author dcarver
- *
- */
-public class TestAttributeContentAssist extends SelectAttributeContentAssist {
-
-	private String ATTR_TEST = "test"; //$NON-NLS$
-	/**
-	 * Constructor for the XSL content assistance for the test attribute.
-	 * 
-	 * @param node
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public TestAttributeContentAssist(Node node, 
-			IStructuredDocumentRegion documentRegion,
-			ITextRegion completionRegion, int begin, int length, String filter,
-			ITextViewer textViewer) {
-		super(node, documentRegion, completionRegion, begin, length, filter,
-				textViewer);
-	}
-	
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.xsl.ui.internal.contentassist.SelectAttributeContentAssist#getCompletionProposals()
-	 */
-	@Override
-	public ArrayList<ICompletionProposal> getCompletionProposals() {
-		
-		adjustXPathStart();
-		
-		int offset = getReplacementBeginPosition();
-		IDOMAttr attrNode = (IDOMAttr)((IDOMElement)getNode()).getAttributeNode("test");
-		
-		matchString = extractXPathMatchString(attrNode, getRegion(), getReplacementBeginPosition());
-		
-	    addSelectProposals((Element)getNode().getParentNode(), offset);
-
-		return getAllCompletionProposals();
-    }
-	
-	/**
-	 *  This needs to setup the content assistance correctly. Here is what needs to happen:
-	 *  1. Adjust the matchString (This should have been calculated earlier) 
-	 *  2. Get the current tokens offset position..this will be the starting offset.
-	 *  3. Get the replacement length...this is the difference between the token offset and the next token or end of the string
-	 */
-	@Override
-	protected void adjustXPathStart() {
-	    IDOMElement elem = (IDOMElement)getNode();
-	    IDOMAttr xpathNode = (IDOMAttr)elem.getAttributeNode(ATTR_TEST);
-		
-		if (xpathNode != null) {
-			XPathParser parser = new XPathParser(xpathNode.getValue());
-			int startOffset = xpathNode.getValueRegionStartOffset() + parser.getTokenStartOffset(1, getReplacementBeginPosition() - xpathNode.getValueRegionStartOffset()) - 1;
-			replacementLength = getReplacementBeginPosition() - startOffset;
-		}
-	}
-}
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 b2c400f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistProcessor.java
+++ /dev/null
@@ -1,452 +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
- *     David Carver - STAR - bug 230958 - refactored to fix bug with getting
- *                                        the DOM Document for the current editor
- *     David Carver - STAR - bug 240170 - refactored code to help with narrowing of
- *                                        results and easier maintenance.
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-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.ui.internal.contentassist.ContentAssistUtils;
-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.AbstractContentAssistProcessor;
-import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentAssistProcessor;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.w3c.dom.Node;
-
-/**
- * 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
- * @since 1.0
- */
-public class XSLContentAssistProcessor implements IContentAssistProcessor {
-
-	private String errorMessage = "";
-	private ITextViewer textViewer = null;
-	private ArrayList<ICompletionProposal> xslProposals;
-	private ArrayList<ICompletionProposal> additionalProposals;
-	private IndexedRegion treeNode;
-	private Node node;
-	private IDOMNode xmlNode;
-	private IStructuredDocumentRegion sdRegion;
-	private ITextRegion completionRegion;
-	private String matchString;
-	private int cursorPosition;
-
-	/**
-	 * Provides an XSL Content Assist Processor class that is XSL aware and XML
-	 * aware.
-	 */
-	public XSLContentAssistProcessor() {
-		super();
-		xslProposals = new ArrayList<ICompletionProposal>();
-		additionalProposals = new ArrayList<ICompletionProposal>();
-	}
-
-	/**
-	 * CONTENT ASSIST STARTS HERE
-	 * 
-	 * Return a list of proposed code completions based on the specified
-	 * location within the document that corresponds to the current cursor
-	 * position within the text-editor control.
-	 * 
-	 * @param textViewer
-	 * @param documentPosition
-	 *            - the cursor location within the document
-	 * 
-	 * @return an array of ICompletionProposal
-	 */
-	public ICompletionProposal[] computeCompletionProposals(
-			ITextViewer textViewer, int documentPosition) {
-		initializeProposalVariables(textViewer, documentPosition);
-
-		ICompletionProposal[] xmlProposals = getXMLProposals();
-
-		additionalProposals = getAdditionalXSLElementProposals();
-
-		xslProposals = getXSLNamespaceProposals();
-
-		ArrayList<ICompletionProposal> proposalList = new ArrayList<ICompletionProposal>();
-		addProposals(xmlProposals, proposalList);
-		proposalList.addAll(additionalProposals);
-		proposalList.addAll(xslProposals);
-
-		ICompletionProposal[] combinedProposals = combineProposals(proposalList);
-
-		if (combinedProposals == null || combinedProposals.length == 0) {
-			setErrorMessage(Messages.getString("NoContentAssistance"));
-		}
-
-		return combinedProposals;
-	}
-
-	/**
-	 * @param textViewer
-	 * @param documentPosition
-	 */
-	private void initializeProposalVariables(ITextViewer textViewer,
-			int documentPosition) {
-		this.textViewer = textViewer;
-		cursorPosition = documentPosition;
-		treeNode = ContentAssistUtils.getNodeAt(textViewer, cursorPosition);
-		node = getActualDOMNode((Node) treeNode);
-		xmlNode = (IDOMNode) node;
-		sdRegion = getStructuredDocumentRegion();
-		completionRegion = getCompletionRegion(cursorPosition, node);
-		matchString = getMatchString(sdRegion, completionRegion, cursorPosition);
-	}
-
-	private ArrayList<ICompletionProposal> getXSLNamespaceProposals() {
-		if (XSLCore.isXSLNamespace(xmlNode)) {
-			XSLContentAssistRequestFactory requestFactory = new XSLContentAssistRequestFactory(
-					textViewer, cursorPosition, xmlNode, sdRegion,
-					completionRegion, matchString);
-
-			IContentAssistProposalRequest contentAssistRequest = requestFactory
-					.getContentAssistRequest();
-			xslProposals = contentAssistRequest.getCompletionProposals();
-		}
-		return xslProposals;
-	}
-
-	private ArrayList<ICompletionProposal> getAdditionalXSLElementProposals() {
-		if (!XSLCore.isXSLNamespace(xmlNode)) {
-			additionalProposals = new ElementContentAssistRequest(xmlNode,
-					sdRegion, completionRegion, cursorPosition, 0, matchString,
-					textViewer).getCompletionProposals();
-		}
-		return additionalProposals;
-	}
-
-	private ICompletionProposal[] getXMLProposals() {
-		AbstractContentAssistProcessor processor = new XMLContentAssistProcessor();
-
-		ICompletionProposal proposals[] = processor.computeCompletionProposals(
-				textViewer, cursorPosition);
-		return proposals;
-	}
-
-	private void addProposals(ICompletionProposal[] proposals,
-			ArrayList<ICompletionProposal> proposalList) {
-		if (proposals != null) {
-			for (int cnt = 0; cnt < proposals.length; cnt++) {
-				proposalList.add(proposals[cnt]);
-			}
-		}
-	}
-
-	private ICompletionProposal[] combineProposals(
-			ArrayList<ICompletionProposal> proposalList) {
-		ICompletionProposal[] combinedProposals = new ICompletionProposal[proposalList
-				.size()];
-		proposalList.toArray(combinedProposals);
-		return combinedProposals;
-	}
-
-	/**
-	 * @param node
-	 * @return
-	 */
-	private Node getActualDOMNode(Node node) {
-		while ((node != null) && (node.getNodeType() == Node.TEXT_NODE)
-				&& (node.getParentNode() != null)) {
-			node = node.getParentNode();
-		}
-		return node;
-	}
-
-	/**
-	 * StructuredTextViewer must be set before using this.
-	 * 
-	 * @param pos
-	 * @return
-	 */
-	private IStructuredDocumentRegion getStructuredDocumentRegion() {
-		return ContentAssistUtils.getStructuredDocumentRegion(textViewer,
-				cursorPosition);
-	}
-
-	/**
-	 * Return the region whose content's require completion. This is something
-	 * of a misnomer as sometimes the user wants to be prompted for contents of
-	 * a non-existent ITextRegion, such as for enumerated attribute values
-	 * following an '=' sign.
-	 * 
-	 * Copied from AbstractContentAssist Processor.
-	 */
-	protected ITextRegion getCompletionRegion(int documentPosition, Node domnode) {
-		if (domnode == null) {
-			return null;
-		}
-
-		ITextRegion region = null;
-		int offset = documentPosition;
-		IStructuredDocumentRegion flatNode = null;
-		IDOMNode node = (IDOMNode) domnode;
-
-		if (node.getNodeType() == Node.DOCUMENT_NODE) {
-			if (node.getStructuredDocument().getLength() == 0) {
-				return null;
-			}
-			ITextRegion result = node.getStructuredDocument()
-					.getRegionAtCharacterOffset(offset)
-					.getRegionAtCharacterOffset(offset);
-			while (result == null) {
-				offset--;
-				result = node.getStructuredDocument()
-						.getRegionAtCharacterOffset(offset)
-						.getRegionAtCharacterOffset(offset);
-			}
-			return result;
-		}
-
-		IStructuredDocumentRegion startTag = node
-				.getStartStructuredDocumentRegion();
-		IStructuredDocumentRegion endTag = node
-				.getEndStructuredDocumentRegion();
-
-		if ((startTag != null) && (startTag.getStartOffset() <= offset)
-				&& (offset < startTag.getStartOffset() + startTag.getLength())) {
-			flatNode = startTag;
-		} else if ((endTag != null) && (endTag.getStartOffset() <= offset)
-				&& (offset < endTag.getStartOffset() + endTag.getLength())) {
-			flatNode = endTag;
-		}
-
-		if (flatNode != null) {
-			region = getCompletionRegion(offset, flatNode);
-		} else {
-			flatNode = node.getStructuredDocument().getRegionAtCharacterOffset(
-					offset);
-			if ((flatNode.getStartOffset() <= documentPosition)
-					&& (flatNode.getEndOffset() >= documentPosition)) {
-				if ((offset == flatNode.getStartOffset())
-						&& (flatNode.getPrevious() != null)
-						&& (((flatNode
-								.getRegionAtCharacterOffset(documentPosition) != null) && (flatNode
-								.getRegionAtCharacterOffset(documentPosition)
-								.getType() != DOMRegionContext.XML_CONTENT))
-								|| (flatNode.getPrevious().getLastRegion()
-										.getType() == DOMRegionContext.XML_TAG_OPEN) || (flatNode
-								.getPrevious().getLastRegion().getType() == DOMRegionContext.XML_END_TAG_OPEN))) {
-					region = flatNode.getPrevious().getLastRegion();
-				} else if (flatNode.getEndOffset() == documentPosition) {
-					region = flatNode.getLastRegion();
-				} else {
-					region = flatNode.getFirstRegion();
-				}
-			} else {
-				region = flatNode.getLastRegion();
-			}
-		}
-
-		return region;
-	}
-
-	protected ITextRegion getCompletionRegion(int offset,
-			IStructuredDocumentRegion sdRegion) {
-		ITextRegion region = sdRegion.getRegionAtCharacterOffset(offset);
-		if (region == null) {
-			return null;
-		}
-
-		if (sdRegion.getStartOffset(region) == offset) {
-			// The offset is at the beginning of the region
-			if ((sdRegion.getStartOffset(region) == sdRegion.getStartOffset())
-					&& (sdRegion.getPrevious() != null)
-					&& (!sdRegion.getPrevious().isEnded())) {
-				region = sdRegion.getPrevious().getRegionAtCharacterOffset(
-						offset - 1);
-			} else {
-				// Is there no separating whitespace from the previous region?
-				// If not,
-				// then that region is the important one
-				ITextRegion previousRegion = sdRegion
-						.getRegionAtCharacterOffset(offset - 1);
-				if ((previousRegion != null)
-						&& (previousRegion != region)
-						&& (previousRegion.getTextLength() == previousRegion
-								.getLength())) {
-					region = previousRegion;
-				}
-			}
-		} else {
-			// The offset is NOT at the beginning of the region
-			if (offset > sdRegion.getStartOffset(region)
-					+ region.getTextLength()) {
-				// Is the offset within the whitespace after the text in this
-				// region?
-				// If so, use the next region
-				ITextRegion nextRegion = sdRegion
-						.getRegionAtCharacterOffset(sdRegion
-								.getStartOffset(region)
-								+ region.getLength());
-				if (nextRegion != null) {
-					region = nextRegion;
-				}
-			} else {
-				// Is the offset within the important text for this region?
-				// If so, then we've already got the right one.
-			}
-		}
-
-		// valid WHITE_SPACE region handler (#179924)
-		if ((region != null)
-				&& (region.getType() == DOMRegionContext.WHITE_SPACE)) {
-			ITextRegion previousRegion = sdRegion
-					.getRegionAtCharacterOffset(sdRegion.getStartOffset(region) - 1);
-			if (previousRegion != null) {
-				region = previousRegion;
-			}
-		}
-
-		return region;
-	}
-
-	private String getMatchString(IStructuredDocumentRegion parent,
-			ITextRegion aRegion, int offset) {
-		String matchString = "";
-		
-		if (isNotMatchStringRegion(parent, aRegion, offset)) {
-			return matchString; 
-		}
-
-		if (hasMatchString(parent, aRegion, offset)) {
-			matchString = extractMatchString(parent, aRegion, offset);
-		}
-		return matchString;
-	}
-
-	private boolean isNotMatchStringRegion(IStructuredDocumentRegion parent, ITextRegion aRegion, int offset) {
-		if (aRegion == null || parent == null)
-			return true;
-		
-		String regionType = aRegion.getType();
-		int totalRegionOffset = parent.getStartOffset(aRegion)
-				+ aRegion.getTextLength();
-		return (isCloseRegion(aRegion)
-				|| hasNoMatchString(offset, regionType, totalRegionOffset));
-	}
-
-	private boolean isCloseRegion(ITextRegion region) {
-		String type = region.getType();
-		return ((type == DOMRegionContext.XML_PI_CLOSE)
-				|| (type == DOMRegionContext.XML_TAG_CLOSE)
-				|| (type == DOMRegionContext.XML_EMPTY_TAG_CLOSE)
-				|| (type == DOMRegionContext.XML_CDATA_CLOSE)
-				|| (type == DOMRegionContext.XML_COMMENT_CLOSE)
-				|| (type == DOMRegionContext.XML_ATTLIST_DECL_CLOSE)
-				|| (type == DOMRegionContext.XML_ELEMENT_DECL_CLOSE)
-				|| (type == DOMRegionContext.XML_DOCTYPE_DECLARATION_CLOSE) || (type == DOMRegionContext.XML_DECLARATION_CLOSE));
-	}
-
-	private boolean hasMatchString(IStructuredDocumentRegion parent,
-			ITextRegion aRegion, int offset) {
-		return (parent.getText(aRegion).length() > 0)
-				&& (parent.getStartOffset(aRegion) < offset);
-	}
-
-	private boolean hasNoMatchString(int offset, String regionType,
-			int totalRegionOffset) {
-		return regionType == DOMRegionContext.XML_CONTENT
-				|| regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS
-				|| regionType == DOMRegionContext.XML_TAG_OPEN
-				|| offset > totalRegionOffset;
-	}
-
-	private String extractMatchString(IStructuredDocumentRegion parent,
-			ITextRegion aRegion, int offset) {
-		String matchString;
-		matchString = parent.getText(aRegion).substring(0,
-				offset - parent.getStartOffset(aRegion));
-		if (matchString.startsWith("\"")) {
-			matchString = matchString.substring(1);
-		}
-		return matchString;
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer,
-	 *      int)
-	 */
-	public IContextInformation[] computeContextInformation(ITextViewer viewer,
-			int offset) {
-		return null;
-	}
-
-	/**
-	 * Returns the characters which when entered by the user should
-	 * automatically trigger the presentation of possible completions.
-	 * 
-	 * the auto activation characters for completion proposal or
-	 * <code>null</code> if no auto activation is desired
-	 * 
-	 * @return an array of activation characters
-	 */
-	public char[] getCompletionProposalAutoActivationCharacters() {
-		char[] completionProposals = { '"', '\'', ':', '[', '{', '<' };
-
-		return completionProposals;
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
-	 */
-	public char[] getContextInformationAutoActivationCharacters() {
-		return null;
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
-	 */
-	public IContextInformationValidator getContextInformationValidator() {
-		return null;
-	}
-
-	/**
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		return errorMessage;
-	}
-
-	/**
-	 * Sets the error message for why content assistance didn't complete.
-	 * 
-	 * @param errorMessage
-	 */
-	public void setErrorMessage(String errorMessage) {
-		this.errorMessage = errorMessage;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistRequestFactory.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistRequestFactory.java
deleted file mode 100644
index d82a77e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistRequestFactory.java
+++ /dev/null
@@ -1,183 +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 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.NamedNodeMap;
-
-/**
- * A Factory that determines which Content Assist Request class is needed and
- * returns the appropriate class.
- * 
- * @author David Carver
- * @since 1.0
- */
-public class XSLContentAssistRequestFactory {
-	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$
-	private static final String ATTR_EXCLUDE_RESULT_PREFIXES = "exclude-result-prefixes"; //$NON-NLS-1$
-	private static final String ATTR_MODE = "mode"; //$NON-NLS-1$
-	private static final String ELEM_TEMPLATE = "template"; //$NON-NLS-1$
-	private static final String ELEM_APPLYTEMPLATES = "apply-templates"; //$NON-NLS-1$
-	private static final String ELEM_APPLY_IMPORTS = "apply-imports"; //$NON-NLS-1$
-	private static final String ATTR_HREF = "href"; //$NON-NLS-1$
-	private static final String ELEM_CALLTEMPLATE = "call-template"; //$NON-NLS-1$
-	private static final String ATTR_NAME = "name"; //$NON-NLS-1$
-	private ITextViewer textViewer;
-	private int documentPosition;
-	private IDOMNode xmlNode;
-	private IStructuredDocumentRegion sdRegion;
-	private ITextRegion completionRegion;
-	private String matchString;
-	
-
-	/**
-	 * @param textViewer
-	 * @param documentPosition
-	 * @param xmlNode
-	 * @param sdRegion
-	 * @param completionRegion
-	 * @param matchString
-	 */
-	public XSLContentAssistRequestFactory(ITextViewer textViewer, int documentPosition, IDOMNode xmlNode,
-			IStructuredDocumentRegion sdRegion, ITextRegion completionRegion,
-			String matchString) {
-		this.textViewer = textViewer;
-		this.documentPosition = documentPosition;
-		this.xmlNode = xmlNode;
-		this.sdRegion = sdRegion;
-		this.completionRegion = completionRegion;
-		this.matchString = matchString;
-	}
-	/**
-	 * Get the appropriate content assist request class for the XSL request.
-	 * @return
-	 */
-	public IContentAssistProposalRequest getContentAssistRequest() {
-		NamedNodeMap nodeMap = xmlNode.getAttributes();
-		IDOMElement element = (IDOMElement) xmlNode;
-		IContentAssistProposalRequest proposal = commonAttributeProposals(nodeMap);
-		
-		if (proposal instanceof NullContentAssistRequest) {
-			if (isElementProposal(element)) {
-				proposal = getElementProposals(nodeMap, element);
-			}
-		}
-
-		return proposal;
-	}
-	
-	private boolean isElementProposal(IDOMElement element) {
-		String localName = element.getLocalName();
-		return localName.equals(ELEM_TEMPLATE) ||
-		       localName.equals(ELEM_APPLYTEMPLATES) ||
-		       localName.equals(ELEM_CALLTEMPLATE);
-	}
-	
-
-	private IContentAssistProposalRequest getElementProposals(NamedNodeMap nodeMap, IDOMElement element) {
-		if (element.getLocalName().equals(ELEM_TEMPLATE)) {
-			return getTemplateProposals(nodeMap);
-		}
-
-		if (element.getLocalName().equals(ELEM_APPLYTEMPLATES)
-				|| element.getLocalName().equals(ELEM_APPLY_IMPORTS)) {
-			if (hasAttributeAtTextRegion(ATTR_MODE, nodeMap, completionRegion)) {
-				return new TemplateModeAttributeContentAssist(xmlNode,
-						sdRegion, completionRegion, documentPosition, 0,
-						matchString, textViewer);
-			}
-
-		}
-
-		if (element.getLocalName().equals(ELEM_CALLTEMPLATE)) {
-			if (hasAttributeAtTextRegion(ATTR_NAME, nodeMap, completionRegion)) {
-				return new CallTemplateContentAssistRequest(xmlNode, sdRegion,
-						completionRegion, documentPosition, 0, matchString,
-						textViewer);
-			}
-		}
-		
-		return new NullContentAssistRequest(xmlNode, sdRegion,
-				completionRegion, documentPosition, 0, matchString, textViewer);		
-		
-	}
-	
-	private IContentAssistProposalRequest getTemplateProposals(NamedNodeMap nodeMap) {
-		if (hasAttributeAtTextRegion(ATTR_MODE, nodeMap, completionRegion)) {
-			return new TemplateModeAttributeContentAssist(xmlNode,
-					sdRegion, completionRegion, documentPosition, 0,
-					matchString, textViewer);
-		}
-		
-		if (hasAttributeAtTextRegion(ATTR_NAME, nodeMap, completionRegion)) {
-			return new TemplateNameAttributeContentAssist( xmlNode,
-					sdRegion, completionRegion, documentPosition, 0,
-					matchString, textViewer);        
-		}
-		
-		return new NullContentAssistRequest(xmlNode, sdRegion,
-				completionRegion, documentPosition, 0, matchString, textViewer);		
-		
-	}
-	
-	private IContentAssistProposalRequest commonAttributeProposals(
-			NamedNodeMap nodeMap) {
-		if (hasAttributeAtTextRegion(ATTR_SELECT, nodeMap,
-				completionRegion)) {
-			return new SelectAttributeContentAssist(xmlNode, sdRegion,
-					completionRegion, documentPosition, 0, matchString,
-					textViewer);
-		}
-
-		if (hasAttributeAtTextRegion(ATTR_MATCH, nodeMap, completionRegion)) {
-			return new SelectAttributeContentAssist(xmlNode, sdRegion,
-					completionRegion, documentPosition, 0, matchString,
-					textViewer);
-		}
-
-		if (hasAttributeAtTextRegion(ATTR_TEST, nodeMap, completionRegion)) {
-			return new TestAttributeContentAssist(xmlNode, sdRegion,
-					completionRegion, documentPosition, 0, matchString,
-					textViewer);
-		}
-
-		if (hasAttributeAtTextRegion(ATTR_EXCLUDE_RESULT_PREFIXES,
-				nodeMap, completionRegion)) {
-			return new ExcludeResultPrefixesContentAssist(xmlNode, sdRegion,
-					completionRegion, documentPosition, 0, matchString,
-					textViewer);
-		}
-
-		if (hasAttributeAtTextRegion(ATTR_HREF, nodeMap, completionRegion)) {
-			return new HrefContentAssistRequest(xmlNode, sdRegion,
-					completionRegion, documentPosition, 0, matchString,
-					textViewer);
-		}
-
-
-		return new NullContentAssistRequest(xmlNode, sdRegion,
-				completionRegion, documentPosition, 0, matchString, textViewer);
-	}
-
-	protected boolean hasAttributeAtTextRegion(String attrName,
-			NamedNodeMap nodeMap, ITextRegion aRegion) {
-		IDOMAttr attrNode = (IDOMAttr) nodeMap.getNamedItem(attrName);
-		return attrNode != null && attrNode.getValueRegion() != null
-				&& attrNode.getValueRegion().getStart() == aRegion.getStart();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/contentmodel/XSLContentModelGenerator.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/contentmodel/XSLContentModelGenerator.java
deleted file mode 100755
index f88876f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/contentmodel/XSLContentModelGenerator.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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 244978 - initial API and implementation based on
- *           org.eclipse.wst.xml.ui.internal.contentassit.XMLContentModelGenerator
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentModelGenerator;
-import org.w3c.dom.Node;
-
-
-/**
- * This provides the ContentModel based off the XSL xml schema grammars and other
- * grammars provided by the xml editor.
- * 
- * @since 1.1
- *
- */
-public class XSLContentModelGenerator extends AbstractContentModelGenerator {
-
-
-	/**
-	 * XSLContentModelGenerator constructor comment.
-	 */
-	public XSLContentModelGenerator() {
-		super();
-	}
-
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentModelGenerator#generateAttribute(org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration, java.lang.StringBuffer)
-	 */
-	public void generateAttribute(CMAttributeDeclaration attrDecl, StringBuffer buffer) {
-		if ((attrDecl == null) || (buffer == null)) {
-			return;
-		}
-		int usage = attrDecl.getUsage();
-		if (usage == CMAttributeDeclaration.REQUIRED) {
-			buffer.append(" "); //$NON-NLS-1$
-			generateRequiredAttribute(null, attrDecl, buffer); // todo pass
-			// ownerNode as
-			// 1st param
-		}
-		return;
-	}
-
-	protected void generateEndTag(String tagName, Node parentNode, CMElementDeclaration elementDecl, StringBuffer buffer) {
-		if (elementDecl == null) {
-			return;
-		}
-		if (elementDecl.getContentType() != CMElementDeclaration.EMPTY) {
-			buffer.append("</" + tagName + ">");//$NON-NLS-2$//$NON-NLS-1$
-		}
-		return;
-	}
-
-	/**
-	 * @param ownerNode
-	 * @param attrDecl
-	 * @param buffer
-	 */
-	public void generateRequiredAttribute(Node ownerNode, CMAttributeDeclaration attrDecl, StringBuffer buffer) {
-		if ((attrDecl == null) || (buffer == null)) {
-			return;
-		}
-
-		// attribute name
-		String attributeName = getRequiredName(ownerNode, attrDecl);
-		CMDataType attrType = attrDecl.getAttrType();
-		String defaultValue = null;
-		// = sign
-		buffer.append(attributeName + "="); //$NON-NLS-1$
-		// attribute value
-		if (attrType != null) {
-			// insert any value that is implied
-			if ((attrType.getImpliedValueKind() != CMDataType.IMPLIED_VALUE_NONE) && (attrType.getImpliedValue() != null)) {
-				defaultValue = attrType.getImpliedValue();
-			}
-			// otherwise, if an enumerated list of values exists, use the
-			// first value
-			else if ((attrType.getEnumeratedValues() != null) && (attrType.getEnumeratedValues().length > 0)) {
-				defaultValue = attrType.getEnumeratedValues()[0];
-			}
-		}
-		
-		char attrQuote = '\"';
-		// Found a double quote, wrap the attribute in single quotes
-		if(defaultValue != null && defaultValue.indexOf(attrQuote) >= 0) {
-			attrQuote = '\'';
-		}
-		
-		buffer.append(attrQuote);
-		buffer.append(((defaultValue != null) ? defaultValue : "")); //$NON-NLS-1$
-		buffer.append(attrQuote);
-		return;
-	}
-
-	protected void generateStartTag(String tagName, Node parentNode, CMElementDeclaration elementDecl, StringBuffer buffer) {
-		if ((elementDecl == null) || (buffer == null)) {
-			return;
-		}
-		buffer.append("<" + tagName);//$NON-NLS-1$
-		generateAttributes(elementDecl, buffer);
-		buffer.append(getStartTagClose(parentNode, elementDecl));
-		return;
-	}
-
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentModelGenerator#getMinimalStartTagLength(org.w3c.dom.Node, org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration)
-	 */
-	public int getMinimalStartTagLength(Node node, CMElementDeclaration elementDecl) {
-		if (elementDecl == null) {
-			return 0;
-		}
-		if (requiresAttributes(elementDecl)) {
-			return getRequiredName(node, elementDecl).length() + 2; // < +
-			// name +
-			// space
-		}
-		else {
-			return 1 + getRequiredName(node, elementDecl).length() + getStartTagClose(node, elementDecl).length(); // < +
-			// name
-			// +
-			// appropriate
-			// close
-		}
-	}
-
-	protected String getOtherClose(Node notATagNode) {
-		return null;
-	}
-
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentModelGenerator#getStartTagClose(org.w3c.dom.Node, org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration)
-	 */
-	public String getStartTagClose(Node parentNode, CMElementDeclaration elementDecl) {
-		String other = getOtherClose(parentNode);
-		if (other != null) {
-			return other;
-		}
-		if (elementDecl == null) {
-			return ">";//$NON-NLS-1$
-		}
-		if (elementDecl.getContentType() == CMElementDeclaration.EMPTY) {
-			return "/>"; //$NON-NLS-1$
-		}
-		return ">"; //$NON-NLS-1$
-	}
-}
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 7dc90a6..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-ExcludeResultPrefixesContentAssist.2=XML Namespace:
-XPathCustomTemplateProposal.1=Description:\r\n
-NoContentAssistance=No Content Assistance Proposals Available.
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/doubleclick/XSLDoubleClickStrategy.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/doubleclick/XSLDoubleClickStrategy.java
deleted file mode 100755
index aeff64c..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/doubleclick/XSLDoubleClickStrategy.java
+++ /dev/null
@@ -1,121 +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, based on a patch
- *                           provided by Nik Matyushev in bug 195262.
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.doubleclick;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.doubleclick.XMLDoubleClickStrategy;
- 
-
-/**
- * XSLDoubleClickStrategy extends the XMLDoubleclickStrategy to take into
- * account those areas that may be involved in XPath Expressions.
- * 
- * 
- * @author dcarver
- * 
- */
-public class XSLDoubleClickStrategy extends XMLDoubleClickStrategy {
-	protected static final char[] XML_DELIMITERS = { ' ', '\'', '\"', '[', ']',
-			'|', '(', ')', '{', '}', '=', '!' };
-	protected static final char[] XML_PARENTHESIS = { '[', ']', '(', ')', '{',
-			'}' };
-
-	@Override
-	protected Point getWord(String string, int cursor) {
-		if (string == null) {
-			return null;
-		}
-
-		int wordStart = 0;
-		int wordEnd = string.length();
-
-		wordStart = startOfWord(string, cursor, wordStart);
-		wordEnd = endOfWord(string, cursor, wordEnd);
-		wordEnd = checkXPathExpression(string, wordEnd);
-
-		if ((wordStart == wordEnd) && !isQuoted(string)) {
-			wordStart = 0;
-			wordEnd = string.length();
-		}
-
-		return new Point(wordStart, wordEnd);
-	}
-
-	private int checkXPathExpression(String string, int wordEnd) {
-		if (wordEnd < string.length() - 1) {
-			// check paranthesis
-			int[] flags = new int[XML_PARENTHESIS.length / 2];
-			boolean found = false;
-			int pos = wordEnd;
-			do {
-				char cur = string.charAt(pos);
-				for (int i = 0; i < XML_PARENTHESIS.length; i++) {
-					if (cur == XML_PARENTHESIS[i]) {
-						flags[i / 2] += (i % 2 == 0 ? 1 : -1);
-						found = true;
-					}
-				}
-				boolean stop = true;
-				boolean unbalanced = false;
-				for (int i = 0; i < flags.length; i++) {
-					stop = stop && flags[i] == 0;
-					unbalanced |= flags[i] < 0;
-				}
-
-				if (!unbalanced) {
-					pos++;
-				}
-				if (stop | unbalanced) {
-					break;
-				}
-			} while (pos < string.length());
-			
-			if (found) {
-				wordEnd = Math.min(string.length() - 1, pos);
-			}
-		}
-		return wordEnd;
-	}
-
-	private int endOfWord(String string, int cursor, int wordEnd) {
-		for (int i = 0; i < XML_DELIMITERS.length; i++) {
-			char delim = XML_DELIMITERS[i];
-			int end = string.indexOf(delim, cursor);
-			wordEnd = Math.min(wordEnd, end == -1 ? string.length() : end);
-		}
-
-		if (wordEnd == string.length()) {
-			wordEnd = cursor;
-		}
-		return wordEnd;
-	}
-
-	protected int startOfWord(String string, int cursor, int wordStart) {
-		for (int i = 0; i < XML_DELIMITERS.length; i++) {
-			char delim = XML_DELIMITERS[i];
-			wordStart = Math.max(wordStart, string.lastIndexOf(delim,
-					cursor - 1));
-		}
-
-		if (wordStart == -1) {
-			wordStart = cursor;
-		} else {
-			wordStart++;
-		}
-		return wordStart;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/OverrideIndicatorImageProvider.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/OverrideIndicatorImageProvider.java
deleted file mode 100644
index 61b2b7f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/OverrideIndicatorImageProvider.java
+++ /dev/null
@@ -1,63 +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.editor;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.texteditor.IAnnotationImageProvider;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-/**
- * Image provider for {@link org.eclipse.wst.xsl.ui.internal.editor.jdt.internal.ui.javaeditor.OverrideIndicatorManager.OverrideIndicator} annotations.
- * 
- * @since 3.0
- */
-public class OverrideIndicatorImageProvider implements IAnnotationImageProvider
-{
-	private static final String OVERRIDE_IMG_DESC_ID = "OverrideIndicatorImageProvider.OVERRIDE_IMG_DESC_ID"; //$NON-NLS-1$
-
-	/**
-	 * This does not support managing its own image.
-	 * 
-	 * @param annotation
-	 * @return null
-	 */
-	public Image getManagedImage(Annotation annotation)
-	{
-		return null;
-	}
-
-	/**
-	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptorId(org.eclipse.jface.text.source.Annotation)
-	 */
-	public String getImageDescriptorId(Annotation annotation)
-	{
-		if (!isImageProviderFor(annotation))
-			return null;
-		return OVERRIDE_IMG_DESC_ID;
-	}
-
-	/**
-	 * @see org.eclipse.ui.texteditor.IAnnotationImageProvider#getImageDescriptor(java.lang.String)
-	 */
-	public ImageDescriptor getImageDescriptor(String imageDescritporId)
-	{
-		if (OVERRIDE_IMG_DESC_ID.equals(imageDescritporId))
-			return XSLUIPlugin.imageDescriptorFromPlugin(XSLUIPlugin.PLUGIN_ID, "icons/full/over_co.gif");
-		return null;
-	}
-
-	private boolean isImageProviderFor(Annotation annotation)
-	{
-		return annotation != null && OverrideIndicatorManager.ANNOTATION_TYPE.equals(annotation.getType());
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/OverrideIndicatorManager.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/OverrideIndicatorManager.java
deleted file mode 100644
index 0d08e58..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/OverrideIndicatorManager.java
+++ /dev/null
@@ -1,230 +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.editor;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.jface.text.ISynchronizable;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.IAnnotationModelExtension;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.eclipse.wst.xsl.core.model.Template;
-
-/**
- * Manages the override and overwrite indicators for the given Java element and annotation model.
- * 
- * @since 3.0
- */
-public class OverrideIndicatorManager
-{
-
-	/**
-	 * Overwrite and override indicator annotation.
-	 * 
-	 * @since 3.0
-	 */
-	class OverrideIndicator extends Annotation
-	{
-
-		private String fAstNodeKey;
-
-		/**
-		 * Creates a new override annotation.
-		 * 
-		 * @param isOverwriteIndicator
-		 *            <code>true</code> if this annotation is an overwrite indicator, <code>false</code> otherwise
-		 * @param text
-		 *            the text associated with this annotation
-		 * @param key
-		 *            the method binding key
-		 * @since 3.0
-		 */
-		OverrideIndicator(String text, String key)
-		{
-			super(ANNOTATION_TYPE, false, text);
-			fAstNodeKey = key;
-		}
-
-		/**
-		 * Opens and reveals the defining method.
-		 */
-		public void open()
-		{
-			// CompilationUnit ast= SharedASTProvider.getAST(fJavaElement, SharedASTProvider.WAIT_ACTIVE_ONLY, null);
-			// if (ast != null) {
-			// ASTNode node= ast.findDeclaringNode(fAstNodeKey);
-			// if (node instanceof MethodDeclaration) {
-			// try {
-			// IMethodBinding methodBinding= ((MethodDeclaration)node).resolveBinding();
-			// IMethodBinding definingMethodBinding= Bindings.findOverriddenMethod(methodBinding, true);
-			// if (definingMethodBinding != null) {
-			// IJavaElement definingMethod= definingMethodBinding.getJavaElement();
-			// if (definingMethod != null) {
-			// JavaUI.openInEditor(definingMethod, true, true);
-			// return;
-			// }
-			// }
-			// } catch (CoreException e) {
-			// ExceptionHandler.handle(e, JavaEditorMessages.OverrideIndicatorManager_open_error_title, JavaEditorMessages.OverrideIndicatorManager_open_error_messageHasLogEntry);
-			// return;
-			// }
-			// }
-			// }
-			// String title= JavaEditorMessages.OverrideIndicatorManager_open_error_title;
-			// String message= JavaEditorMessages.OverrideIndicatorManager_open_error_message;
-			// MessageDialog.openError(JavaPlugin.getActiveWorkbenchShell(), title, message);
-		}
-	}
-
-	static final String ANNOTATION_TYPE = "org.eclipse.wst.xsl.ui.override"; //$NON-NLS-1$
-
-	private IAnnotationModel fAnnotationModel;
-	private Object fAnnotationModelLockObject;
-	private Annotation[] fOverrideAnnotations;
-
-	private IFile file;
-
-	/**
-	 * Constructor requires the editors annotation model and the file the editor is looking at.
-	 * 
-	 * @param annotationModel
-	 * @param file
-	 */
-	public OverrideIndicatorManager(IAnnotationModel annotationModel, IFile file)
-	{
-		Assert.isNotNull(annotationModel);
-
-		this.file = file;
-		fAnnotationModel = annotationModel;
-		fAnnotationModelLockObject = getLockObject(fAnnotationModel);
-
-		updateAnnotations();
-	}
-
-	/**
-	 * Returns the lock object for the given annotation model.
-	 * 
-	 * @param annotationModel
-	 *            the annotation model
-	 * @return the annotation model's lock object
-	 * @since 3.0
-	 */
-	private Object getLockObject(IAnnotationModel annotationModel)
-	{
-		if (annotationModel instanceof ISynchronizable)
-		{
-			Object lock = ((ISynchronizable) annotationModel).getLockObject();
-			if (lock != null)
-				return lock;
-		}
-		return annotationModel;
-	}
-
-	/**
-	 * Updates the override and implements annotations based on the given AST.
-	 * 
-	 * @param ast
-	 *            the compilation unit AST
-	 * @param progressMonitor
-	 *            the progress monitor
-	 * @since 3.0
-	 */
-	public void updateAnnotations()
-	{
-		StylesheetModel stylesheetComposed = XSLCore.getInstance().getStylesheet(file);
-		final Map<Annotation,Position> annotationMap= new HashMap<Annotation,Position>(50);
-		List<Template> nestedTemplates = stylesheetComposed.findAllNestedTemplates();
-		for (Template template : stylesheetComposed.getStylesheet().getTemplates())
-		{
-			// check for overridden stylesheets
-			for (Template nestedTemplate : nestedTemplates)
-			{
-				IFile nestedFile = nestedTemplate.getStylesheet().getFile();
-				if (nestedFile != null)
-				{
-					if(template.matchesByMatchOrName(nestedTemplate))
-					{// the template overrides another templates as its name matches, or its match and mode matches
-						if (template.getName() != null)
-						{
-							String text = "overrides "+template.getName()+" in "+nestedFile.getName();
-							annotationMap.put(
-								new OverrideIndicator(text, "binding.getKey()"), 
-								new Position(template.getOffset(), template.getLength())
-							);
-						}
-						else
-						{
-							String text = "overrides \""+template.getMatch()+"\"";
-							String mode = template.getMode();
-							if (mode != null)
-								text += " ("+mode+")";
-							text += " in "+nestedFile.getName();
-							annotationMap.put(
-								new OverrideIndicator(text, "binding.getKey()"), 
-								new Position(template.getOffset(), template.getLength())
-							);
-						}
-					}
-				}
-			}
-		}
-
-		synchronized (fAnnotationModelLockObject)
-		{
-			if (fAnnotationModel instanceof IAnnotationModelExtension)
-			{
-				((IAnnotationModelExtension) fAnnotationModel).replaceAnnotations(fOverrideAnnotations, annotationMap);
-			}
-			else
-			{
-				removeAnnotations();
-				Iterator iter = annotationMap.entrySet().iterator();
-				while (iter.hasNext())
-				{
-					Map.Entry mapEntry = (Map.Entry) iter.next();
-					fAnnotationModel.addAnnotation((Annotation) mapEntry.getKey(), (Position) mapEntry.getValue());
-				}
-			}
-			fOverrideAnnotations = (Annotation[]) annotationMap.keySet().toArray(new Annotation[annotationMap.keySet().size()]);
-		}
-	}
-
-	/**
-	 * Removes all override indicators from this manager's annotation model.
-	 */
-	void removeAnnotations()
-	{
-		if (fOverrideAnnotations == null)
-			return;
-
-		synchronized (fAnnotationModelLockObject)
-		{
-			if (fAnnotationModel instanceof IAnnotationModelExtension)
-			{
-				((IAnnotationModelExtension) fAnnotationModel).replaceAnnotations(fOverrideAnnotations, null);
-			}
-			else
-			{
-				for (int i = 0, length = fOverrideAnnotations.length; i < length; i++)
-					fAnnotationModel.removeAnnotation(fOverrideAnnotations[i]);
-			}
-			fOverrideAnnotations = null;
-		}
-	}
-}
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 7986d87..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/SourceFileHyperlink.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.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.model.XSLNode;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-/**
- * @author Doug Satchwell
- *
- */
-public class SourceFileHyperlink implements IHyperlink
-{
-	private IRegion hyperLinkRegion;
-	private IFile linkedFile;
-	private XSLNode sourceArtifact;
-
-	/**
-	 * @param hyperLinkRegion
-	 * @param linkedFile
-	 */
-	public SourceFileHyperlink(IRegion hyperLinkRegion, IFile linkedFile)
-	{
-		this.hyperLinkRegion = hyperLinkRegion;
-		this.linkedFile = linkedFile;
-	}
-
-	/**
-	 * @param hyperLinkRegion
-	 * @param linkedFile
-	 * @param node
-	 */
-	public SourceFileHyperlink(IRegion hyperLinkRegion, IFile linkedFile, XSLNode node)
-	{
-		this.hyperLinkRegion = hyperLinkRegion;
-		this.linkedFile = linkedFile;
-		this.sourceArtifact = node;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkRegion()
-	 */
-	public IRegion getHyperlinkRegion()
-	{
-		return hyperLinkRegion;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
-	 */
-	public String getTypeLabel()
-	{
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
-	 */
-	public String getHyperlinkText()
-	{
-		return linkedFile.getFullPath().toString();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
-	 */
-	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/XSLEditor.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/XSLEditor.java
deleted file mode 100644
index bcf7434..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/XSLEditor.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.editor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-
-public class XSLEditor extends StructuredTextEditor
-{
-	private OverrideIndicatorManager fOverrideIndicatorManager;
-
-	@Override
-	protected void doSetInput(IEditorInput input) throws CoreException
-	{
-		super.doSetInput(input);
-		installOverrideIndicator();
-	}
-	
-	public OverrideIndicatorManager getOverrideIndicatorManager()
-	{
-		return fOverrideIndicatorManager;
-	}
-	
-	protected void installOverrideIndicator()
-	{
-		// uninstallOverrideIndicator();
-		if (getEditorInput() instanceof FileEditorInput)
-		{
-			IAnnotationModel model = getDocumentProvider().getAnnotationModel(getEditorInput());
-			IFile file = ((FileEditorInput)getEditorInput()).getFile();
-			fOverrideIndicatorManager = new OverrideIndicatorManager(model, file);
-		}
-	}
-}
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 24d99fe..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/XSLHyperlinkDetector.java
+++ /dev/null
@@ -1,236 +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 
- *******************************************************************************/
-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.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.model.Parameter;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.eclipse.wst.xsl.core.model.Template;
-import org.eclipse.wst.xsl.core.model.XSLAttribute;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-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
-{
-	private static final String ELEM_WITH_PARAM = "with-param";
-	private static final String ATTR_NAME = "name";
-	private static final String ELM_CALL_TEMPLATE = "call-template";
-
-	/**
-	 * 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)
-		{
-			return detectHyperlinks(textViewer.getDocument(), region, canShowMultipleHyperlinks);
-		}
-		return hyperlink == null ? null : new IHyperlink[]{hyperlink};
-	}
-
-	/**
-	 * Try to create hyperlinks for document and region
-	 * @param document
-	 * @param region
-	 * @param canShowMultipleHyperlinks
-	 * @return array of hyperlinks for current region
-	 */
-	public IHyperlink[] detectHyperlinks(IDocument document, IRegion region, boolean canShowMultipleHyperlinks)
-	{
-		IHyperlink hyperlink = null;
-		
-		if (region != null && document != null)
-		{
-			Node currentNode = XSLCore.getCurrentNode(document, region.getOffset());
-
-			Element xslEl = null;
-			Attr xslAttr = null;
-			if (XSLCore.XSL_NAMESPACE_URI.equals(currentNode.getNamespaceURI())) {
-				if (currentNode.getNodeType() == Node.ATTRIBUTE_NODE)
-				{
-					Attr att = (Attr) currentNode;
-					xslEl = att.getOwnerElement();
-					xslAttr = att;
-				}
-				
-				if (currentNode.getNodeType() == Node.ELEMENT_NODE)
-				{
-					Element el = (Element)currentNode;
-						xslEl = el;
-						xslAttr = XSLCore.getCurrentAttrNode(el, region.getOffset());
-				}
-			}
-			
-			hyperlink = createHyperLink(document, hyperlink, xslEl, xslAttr);
-		}
-		return hyperlink == null ? null : new IHyperlink[]{hyperlink};
-	}
-
-	private IHyperlink createHyperLink(IDocument document,
-			IHyperlink hyperlink, Element xslEl, Attr xslAttr) {
-		if (xslEl != null && xslAttr != null)
-		{
-			IRegion hyperlinkRegion = getHyperlinkRegion(xslAttr);
-			IFile file = getFileForDocument(document);
-			if (file != null)
-			{
-				if (ELM_CALL_TEMPLATE.equals(xslEl.getLocalName()) && ATTR_NAME.equals(xslAttr.getLocalName()))
-				{
-					hyperlink = createCallTemplateHyperLink(file,xslAttr.getValue(), hyperlinkRegion);
-				}
-				
-				if (ELEM_WITH_PARAM.equals(xslEl.getLocalName()) && ATTR_NAME.equals(xslAttr.getLocalName())) {
-					hyperlink = createWithParamHyperLink(file, xslEl, xslAttr, hyperlinkRegion);
-				}
-			}
-			
-		}
-		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 IHyperlink createWithParamHyperLink(IFile currentFile, Element elem, Attr attr, IRegion hyperlinkRegion)
-	{
-		IHyperlink hyperlink = null;
-		StylesheetModel sf = XSLCore.getInstance().getStylesheet(currentFile);
-		if (sf != null)
-		{
-			Node parentNode = elem.getParentNode();
-			Attr parentAttribute = (Attr) parentNode.getAttributes().getNamedItem(ATTR_NAME);
-			String templateName = parentAttribute.getValue();
-			List<Template> templates = sf.getTemplatesByName(templateName);
-			
-			if (templates != null && templates.size() == 1)
-			{
-				Template template = templates.get(0);
-				List<Parameter> parameters = template.getParameters();
-				for(Parameter param : parameters) {
-					String paramName = attr.getValue();
-					XSLAttribute parameterNameAttr = param.getAttribute(ATTR_NAME);
-					if (parameterNameAttr != null && parameterNameAttr.getValue().equals(paramName)) {
-						hyperlink = new SourceFileHyperlink(hyperlinkRegion,template.getStylesheet().getFile(),param);
-					}
-				}
-			}
-		}
-		return hyperlink;
-	}
-
-	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/handlers/OpenDeclarationHandler.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/handlers/OpenDeclarationHandler.java
deleted file mode 100644
index 721764e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/handlers/OpenDeclarationHandler.java
+++ /dev/null
@@ -1,87 +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.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-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.TextSelection;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.xsl.ui.internal.editor.XSLHyperlinkDetector;
-
-public class OpenDeclarationHandler extends AbstractHandler
-{
-	private XSLHyperlinkDetector detector = new XSLHyperlinkDetector();
-
-	public Object execute(ExecutionEvent event) throws ExecutionException
-	{
-		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-
-		ITextEditor textEditor = null;
-		if (editor instanceof ITextEditor)
-			textEditor = (ITextEditor) editor;
-		else
-		{
-			Object o = editor.getAdapter(ITextEditor.class);
-			if (o != null)
-				textEditor = (ITextEditor) o;
-		}
-		if (textEditor != null)
-		{
-			IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-			if (document != null)
-			{
-				// get current text selection
-				ITextSelection textSelection = getCurrentSelection(textEditor);
-				if (textSelection.isEmpty())
-				{
-					return null;
-				}
-				int offset = textSelection.getOffset();
-				if (offset == -1)
-					return null;
-				IRegion region = new Region(offset, 0);
-				IHyperlink[] links = detector.detectHyperlinks(document, region, true);
-				if (links != null && links.length > 0)
-				{
-					IHyperlink link = links[0];
-					link.open();
-				}
-			}
-		}
-
-		return null;
-	}
-
-	private ITextSelection getCurrentSelection(ITextEditor textEditor)
-	{
-		ISelectionProvider provider = textEditor.getSelectionProvider();
-		if (provider != null)
-		{
-			ISelection selection = provider.getSelection();
-			if (selection instanceof ITextSelection)
-			{
-				return (ITextSelection) selection;
-			}
-		}
-		return TextSelection.emptySelection();
-	}
-
-}
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 2c556be..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/AbstractValidationSettingsPage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/AbstractValidationSettingsPage.java
deleted file mode 100644
index b33e146..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/AbstractValidationSettingsPage.java
+++ /dev/null
@@ -1,399 +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 230072 - initial API and implementation
- *                                        based on org.eclipse.wst.html.ui class of
- *                                        the same name.
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.forms.events.ExpansionAdapter;
-import org.eclipse.ui.forms.events.ExpansionEvent;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.wst.sse.core.internal.validate.ValidationMessage;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ScrolledPageContent;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.osgi.service.prefs.BackingStoreException;
-
-/**
- * Based on org.eclipse.jdt.internal.ui.preferences.OptionsConfigurationBlock
- */
-abstract class AbstractValidationSettingsPage extends PropertyPreferencePage {
-
-	private List fCombos;
-	private List fExpandables;
-	
-	private SelectionListener fSelectionListener;
-	
-	private IPreferencesService fPreferencesService = null;
-	
-	private static final String SETTINGS_EXPANDED = "expanded"; //$NON-NLS-1$
-	
-	private ValidationFramework fValidation;
-	
-	private class ComboData {
-		private String fKey;
-		private int[] fSeverities;
-		private int fIndex;
-		int originalSeverity = -2;
-		
-		public ComboData(String key, int[] severities, int index) {
-			fKey = key;
-			fSeverities = severities;
-			fIndex = index;
-		}
-		
-		public String getKey() {
-			return fKey;
-		}
-		
-		public void setIndex(int index) {
-			fIndex = index;
-		}
-		
-		public int getIndex() {
-			return fIndex;
-		}
-		
-		/**
-		 * Sets the severity index based on <code>severity</code>.
-		 * If the severity doesn't exist, the index is set to -1.
-		 * 
-		 * @param severity the severity level
-		 */
-		public void setSeverity(int severity) {
-			for(int i = 0; fSeverities != null && i < fSeverities.length; i++) {
-				if(fSeverities[i] == severity) {
-					fIndex = i;
-					return;
-				}
-			}
-			
-			fIndex = -1;
-		}
-		
-		public int getSeverity() {
-			return (fIndex >= 0 && fSeverities != null && fIndex < fSeverities.length) ? fSeverities[fIndex] : -1;
-		}
-		
-		boolean isChanged() {
-			return fSeverities[fIndex] != originalSeverity;
-		}
-	}
-	
-	public AbstractValidationSettingsPage() {
-		super();
-		fCombos = new ArrayList();
-		fExpandables = new ArrayList();
-		fPreferencesService = Platform.getPreferencesService();
-		fValidation = ValidationFramework.getDefault();
-	}
-	
-	/**
-	 * Creates a Combo widget in the composite <code>parent</code>. The data
-	 * in the Combo is associated with <code>key</code>. The Combo data is
-	 * generated based on the integer <code>values</code> where the index
-	 * of <code>values</code> corresponds to the index of <code>valueLabels</code>
-	 * 
-	 * @param parent the composite to create the combo box in
-	 * @param label the label to give the combo box
-	 * @param key the unique key to identify the combo box
-	 * @param values the values represented by the combo options
-	 * @param valueLabels the calues displayed in the combo box
-	 * @param indent how far to indent the combo box label
-	 * 
-	 * @return the generated combo box
-	 */
-	protected Combo addComboBox(Composite parent, String label, String key, int[] values, String[] valueLabels, int indent) {
-		GridData gd= new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1);
-		gd.horizontalIndent= indent;
-				
-		Label labelControl= new Label(parent, SWT.LEFT);
-		labelControl.setFont(JFaceResources.getDialogFont());
-		labelControl.setText(label);
-		labelControl.setLayoutData(gd);
-				
-		Combo comboBox= newComboControl(parent, key, values, valueLabels);
-		comboBox.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-		return comboBox;
-	}
-	
-	/**
-	 * Creates a combo box and associates the combo data with the
-	 * combo box.
-	 * 
-	 * @param composite the composite to create the combo box in
-	 * @param key the unique key to identify the combo box
-	 * @param values the values represented by the combo options
-	 * @param valueLabels the values displayed in the combo box
-	 * 
-	 * @return the generated combo box
-	 */
-	protected Combo newComboControl(Composite composite, String key, int[] values, String[] valueLabels) {
-		ComboData data = new ComboData(key, values, -1);
-		
-		Combo comboBox= new Combo(composite, SWT.READ_ONLY);
-		comboBox.setItems(valueLabels);
-		comboBox.setData(data);
-		comboBox.addSelectionListener(getSelectionListener());
-		comboBox.setFont(JFaceResources.getDialogFont());
-			
-		makeScrollableCompositeAware(comboBox);
-		
-		int severity = -1;
-		if(key != null)
-			severity = fPreferencesService.getInt(getPreferenceNodeQualifier(), key, ValidationMessage.WARNING, createPreferenceScopes());
-
-		if (severity == ValidationMessage.ERROR || severity == ValidationMessage.WARNING || severity == ValidationMessage.IGNORE) {
-			data.setSeverity(severity);
-			data.originalSeverity = severity;
-		}
-		
-		if(data.getIndex() >= 0)
-			comboBox.select(data.getIndex());
-		
-		fCombos.add(comboBox);
-		return comboBox;
-	}
-	
-	protected SelectionListener getSelectionListener() {
-		if (fSelectionListener == null) {
-			fSelectionListener= new SelectionListener() {
-				public void widgetDefaultSelected(SelectionEvent e) {}
-	
-				public void widgetSelected(SelectionEvent e) {
-					controlChanged(e.widget);
-				}
-			};
-		}
-		return fSelectionListener;
-	}
-	
-	protected void controlChanged(Widget widget) {
-		ComboData data= (ComboData) widget.getData();
-		if (widget instanceof Combo) {
-			data.setIndex(((Combo)widget).getSelectionIndex());
-		} else {
-			return;
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractSettingsPage#storeValues()
-	 */
-	protected void storeValues() {
-		if(fCombos == null || fCombos.size() == 0)
-			return;
-		
-		Iterator it = fCombos.iterator();
-		
-		IScopeContext[] contexts = createPreferenceScopes();
-
-		while(it.hasNext()) {
-			ComboData data = (ComboData) ((Combo)it.next()).getData();
-			if(data.getKey() != null) {
-				contexts[0].getNode(getPreferenceNodeQualifier()).putInt(data.getKey(), data.getSeverity());
-			}
-		}
-		
-		for(int i = 0; i < contexts.length; i++) {
-			try {
-				contexts[i].getNode(getPreferenceNodeQualifier()).flush();
-			}
-			catch (BackingStoreException e) {
-				
-			}
-		}
-	}
-	
-	protected ExpandableComposite getParentExpandableComposite(Control control) {
-		Control parent= control.getParent();
-		while (!(parent instanceof ExpandableComposite) && parent != null) {
-			parent= parent.getParent();
-		}
-		if (parent instanceof ExpandableComposite) {
-			return (ExpandableComposite) parent;
-		}
-		return null;
-	}
-	
-	protected ExpandableComposite createTwistie(Composite parent, String label, int nColumns) {
-		ExpandableComposite excomposite= new ExpandableComposite(parent, SWT.NONE, ExpandableComposite.TWISTIE | ExpandableComposite.CLIENT_INDENT);
-		excomposite.setText(label);
-		excomposite.setExpanded(false);
-		excomposite.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
-		excomposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, nColumns, 1));
-		excomposite.addExpansionListener(new ExpansionAdapter() {
-			public void expansionStateChanged(ExpansionEvent e) {
-				expandedStateChanged((ExpandableComposite) e.getSource());
-			}
-		});
-		fExpandables.add(excomposite);
-		makeScrollableCompositeAware(excomposite);
-		return excomposite;
-	}
-	
-	protected final void expandedStateChanged(ExpandableComposite expandable) {
-		ScrolledPageContent parentScrolledComposite= getParentScrolledComposite(expandable);
-		if (parentScrolledComposite != null) {
-			parentScrolledComposite.reflow(true);
-		}
-	}
-	
-	private void makeScrollableCompositeAware(Control control) {
-		ScrolledPageContent parentScrolledComposite= getParentScrolledComposite(control);
-		if (parentScrolledComposite != null) {
-			parentScrolledComposite.adaptChild(control);
-		}
-	}
-	
-	protected ScrolledPageContent getParentScrolledComposite(Control control) {
-		Control parent= control.getParent();
-		while (!(parent instanceof ScrolledPageContent) && parent != null) {
-			parent= parent.getParent();
-		}
-		if (parent instanceof ScrolledPageContent) {
-			return (ScrolledPageContent) parent;
-		}
-		return null;
-	}
-	
-	protected void storeSectionExpansionStates(IDialogSettings section) {
-		for(int i = 0; i < fExpandables.size(); i++) {
-			ExpandableComposite comp = (ExpandableComposite) fExpandables.get(i);
-			section.put(SETTINGS_EXPANDED + String.valueOf(i), comp.isExpanded());
-		}
-	}
-	
-	protected void restoreSectionExpansionStates(IDialogSettings settings) {
-		for (int i= 0; i < fExpandables.size(); i++) {
-			ExpandableComposite excomposite= (ExpandableComposite) fExpandables.get(i);
-			if (settings == null) {
-				excomposite.setExpanded(i == 0); // only expand the first node by default
-			} else {
-				excomposite.setExpanded(settings.getBoolean(SETTINGS_EXPANDED + String.valueOf(i)));
-			}
-		}
-	}
-	
-	protected void resetSeverities() {
-		IEclipsePreferences defaultContext = new DefaultScope().getNode(getPreferenceNodeQualifier());
-		for(int i = 0; i < fCombos.size(); i++) {
-			ComboData data = (ComboData)((Combo)fCombos.get(i)).getData();
-			int severity = defaultContext.getInt(data.getKey(), ValidationMessage.WARNING);
-			data.setSeverity(severity);
-			((Combo)fCombos.get(i)).select(data.getIndex());
-		}
-	}
-	
-	protected boolean shouldRevalidateOnSettingsChange() {
-		Iterator it = fCombos.iterator();
-
-		while (it.hasNext()) {
-			ComboData data = (ComboData) ((Combo) it.next()).getData();
-			if (data.isChanged())
-				return true;
-		}
-		return false;
-	}
-	
-	public boolean performOk() {
-		if(super.performOk() && shouldRevalidateOnSettingsChange()) {
-			MessageBox mb = new MessageBox(this.getShell(), SWT.APPLICATION_MODAL | SWT.YES | SWT.NO | SWT.CANCEL | SWT.ICON_INFORMATION | SWT.RIGHT);
-			mb.setText("XSL Validation");
-			/* Choose which message to use based on if its project or workspace settings */
-			String msg = (getProject() == null) ? "XSL Workspace Validation" : "XSL Project Level Validation";
-			mb.setMessage(msg);
-			switch(mb.open()) {
-				case SWT.CANCEL:
-					return false;
-				case SWT.YES:
-					ValidateJob job = new ValidateJob("XSL Validation Job");
-					job.schedule();
-				case SWT.NO:
-				default:
-					return true;
-			}
-		}
-		return true;
-	}
-	
-	/**
-	 * Performs validation after validation preferences have been modified.
-	 */
-	private class ValidateJob extends Job {
-		
-		public ValidateJob(String name) {
-			super(name);
-		}
-
-		protected IStatus run(IProgressMonitor monitor) {
-			IStatus status = Status.OK_STATUS;
-			try {
-				IProject[] projects = null;
-				/* Changed preferences for a single project, only validate it */
-				if(getProject() != null)
-					projects = new IProject[] {getProject()};
-				/* Workspace-wide preferences changed */
-				else {
-					/* Get all of the projects in the workspace */
-					projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-					IEclipsePreferences prefs = null;
-					List projectList = new ArrayList();
-					
-					/* Filter out projects that use project-specific settings or have been closed */
-					for(int i = 0; i < projects.length; i++) {
-						prefs = new ProjectScope(projects[i]).getNode(getPreferenceNodeQualifier());
-						if(projects[i].isAccessible() && !prefs.getBoolean(getProjectSettingsKey(), false))
-							projectList.add(projects[i]);
-					}
-					projects = (IProject[]) projectList.toArray(new IProject[projectList.size()]);
-				}
-				fValidation.validate(projects, true, false, monitor);
-			}
-			catch (CoreException ce) {
-				status = Status.CANCEL_STATUS;
-			}
-			
-			return status;
-		}
-		
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/AbstractXSLPreferencePage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/AbstractXSLPreferencePage.java
deleted file mode 100644
index 349869f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/AbstractXSLPreferencePage.java
+++ /dev/null
@@ -1,201 +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 java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.resource.JFaceResources;
-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.forms.events.ExpansionAdapter;
-import org.eclipse.ui.forms.events.ExpansionEvent;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ScrolledPageContent;
-import org.eclipse.wst.xsl.core.internal.XSLCorePlugin;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-/**
- * Augments the SSE <code>AbstractPreferencePage</code> with support for expandable composites (twisties) and combos.
- * 
- * @author Doug Satchwell
- * @see org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage
- */
-public abstract class AbstractXSLPreferencePage extends AbstractPreferencePage
-{
-	private final String SETTINGS_EXPANDED = getClass().getCanonicalName()+".SETTINGS_EXPANDED"; //$NON-NLS-1$
-	private final String SETTINGS_SECTION_NAME = getClass().getCanonicalName()+".SETTINGS_SECTION_NAME";//$NON-NLS-1$
-	private List<ExpandableComposite> fExpandables = new ArrayList<ExpandableComposite>();
-
-	@Override
-	protected final Control createContents(Composite parent)
-	{
-		createCommonContents(parent);
-		loadPreferences();
-		restoreSectionExpansionStates(getDialogSettings().getSection(SETTINGS_SECTION_NAME));
-		return parent;
-	}
-
-	/**
-	 * Called by createContents and must be implemented.
-	 * 
-	 * @param parent
-	 * @return the composite
-	 */
-	protected abstract Composite createCommonContents(Composite parent);
-
-	protected Composite createTwistie(Composite parent, String label, int cols)
-	{
-		ExpandableComposite excomposite = new ExpandableComposite(parent, SWT.NONE, ExpandableComposite.TWISTIE | ExpandableComposite.CLIENT_INDENT);
-		excomposite.setText(label);
-		excomposite.setExpanded(false);
-		excomposite.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
-		excomposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, cols, 1));
-		excomposite.addExpansionListener(new ExpansionAdapter()
-		{
-			public void expansionStateChanged(ExpansionEvent e)
-			{
-				expandedStateChanged((ExpandableComposite) e.getSource());
-			}
-		});
-		fExpandables.add(excomposite);
-		makeScrollableCompositeAware(excomposite);
-
-		Composite twistieCient = new Composite(excomposite, SWT.NONE);
-		excomposite.setClient(twistieCient);
-
-		GridLayout layout = new GridLayout(2, false);
-		layout.marginRight = 5;
-		twistieCient.setLayout(layout);
-
-		GridData gd = new GridData(SWT.FILL, SWT.NONE, true, false);
-		twistieCient.setLayoutData(gd);
-
-		return twistieCient;
-	}
-
-	private final void expandedStateChanged(ExpandableComposite expandable)
-	{
-		ScrolledPageContent parentScrolledComposite = getParentScrolledComposite(expandable);
-		if (parentScrolledComposite != null)
-		{
-			parentScrolledComposite.reflow(true);
-		}
-	}
-
-	private void makeScrollableCompositeAware(Control control)
-	{
-		ScrolledPageContent parentScrolledComposite = getParentScrolledComposite(control);
-		if (parentScrolledComposite != null)
-		{
-			parentScrolledComposite.adaptChild(control);
-		}
-	}
-
-	private ScrolledPageContent getParentScrolledComposite(Control control)
-	{
-		Control parent = control.getParent();
-		while (!(parent instanceof ScrolledPageContent) && parent != null)
-		{
-			parent = parent.getParent();
-		}
-		if (parent instanceof ScrolledPageContent)
-		{
-			return (ScrolledPageContent) parent;
-		}
-		return null;
-	}
-
-	protected Combo createCombo(Composite parent, String label, String prefKey)
-	{
-		GridData gd = new GridData(GridData.FILL, GridData.CENTER, true, false, 1, 1);
-
-		Label labelControl = new Label(parent, SWT.LEFT);
-		labelControl.setFont(JFaceResources.getDialogFont());
-		labelControl.setText(label);
-		labelControl.setLayoutData(gd);
-
-		Combo combo = createDropDownBox(parent);
-		combo.addSelectionListener(this);
-		combo.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		return combo;
-	}
-
-	private void storeSectionExpansionStates(IDialogSettings section)
-	{
-		for (int i = 0; i < fExpandables.size(); i++)
-		{
-			ExpandableComposite comp = (ExpandableComposite) fExpandables.get(i);
-			section.put(SETTINGS_EXPANDED + String.valueOf(i), comp.isExpanded());
-		}
-	}
-
-	private IDialogSettings getDialogSettings()
-	{
-		return XSLUIPlugin.getDefault().getDialogSettings();
-	}
-
-	/**
-	 * Saves the expansion states before calling super.
-	 * 
-	 * @see org.eclipse.jface.dialogs.DialogPage#dispose()
-	 */
-	@Override
-	public void dispose()
-	{
-		storeSectionExpansionStates(getDialogSettings().addNewSection(SETTINGS_SECTION_NAME));
-		super.dispose();
-	}
-
-	private void restoreSectionExpansionStates(IDialogSettings settings)
-	{
-		for (int i = 0; i < fExpandables.size(); i++)
-		{
-			ExpandableComposite excomposite = (ExpandableComposite) fExpandables.get(i);
-			if (settings == null)
-			{
-				excomposite.setExpanded(i == 0); // only expand the first node by default
-			}
-			else
-			{
-				excomposite.setExpanded(settings.getBoolean(SETTINGS_EXPANDED + String.valueOf(i)));
-			}
-		}
-	}
-
-	@Override
-	protected Preferences getModelPreferences()
-	{
-		return XSLCorePlugin.getDefault().getPluginPreferences();
-	}
-
-	/**
-	 * Save the preferences.
-	 * 
-	 * @see org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage#performOk()
-	 */
-	@Override
-	public boolean performOk()
-	{
-		boolean ok = super.performOk();
-		if (ok)
-			XSLCorePlugin.getDefault().savePluginPreferences();
-		return ok;
-	}
-}
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 06a0b77..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(XSLPreferencesMessages.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/PropertyPreferencePage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/PropertyPreferencePage.java
deleted file mode 100644
index 98bae71..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/PropertyPreferencePage.java
+++ /dev/null
@@ -1,299 +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 230072 - initial API and implementation
- *                                        based on org.eclipse.wst.html.ui class of
- *                                        the same name.
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.dialogs.ControlEnableState;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-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.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.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.dialogs.ListDialog;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.views.navigator.ResourceSorter;
-import org.eclipse.wst.sse.core.internal.tasks.TaskTagPreferenceKeys;
-import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-
-/**
- * Based loosely on org.eclipse.jdt.internal.ui.preferences.PropertyAndPreferencePage
- */
-abstract class PropertyPreferencePage extends PropertyPage implements IWorkbenchPreferencePage {
-	private static final boolean _debugPreferences = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.sse.ui/preferences-properties")); //$NON-NLS-1$ //$NON-NLS-2$
-	/*
-	 * Disable link data, prevents the display of a "workspace" or "project"
-	 * settings link to prevent recursive dialog launching
-	 */
-	private static final Object DISABLE_LINK = "DISABLE_LINK"; //$NON-NLS-1$
-
-	private Map Data = null;
-
-	private Button EnableProjectSettings;
-
-	private Link ProjectSettingsLink;
-	
-	private Control Common;
-	
-	private ControlEnableState Enablements;
-
-	public PropertyPreferencePage() {
-		super();
-	}
-
-	public final void applyData(Object data) {
-		super.applyData(data);
-		if (data instanceof Map) {
-			Data = (Map) data;
-			updateLinkEnablement();
-		}
-	}
-
-	protected abstract Control createCommonContents(Composite composite);
-
-	public final Control createContents(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		GridLayout layout = new GridLayout();
-		composite.setLayout(layout);
-		GridData data = new GridData(GridData.FILL_BOTH);
-		composite.setLayoutData(data);
-
-		Composite checkLinkComposite = new Composite(composite, SWT.NONE);
-		checkLinkComposite.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		checkLinkComposite.setLayout(new GridLayout(2, false));
-
-		if (getProject() != null) {
-			EnableProjectSettings = new Button(checkLinkComposite, SWT.CHECK);
-			EnableProjectSettings.setText(SSEUIMessages.EnableProjectSettings); //$NON-NLS-1$//$NON-NLS-2$
-			EnableProjectSettings.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, false));
-			boolean enabledForProject = createPreferenceScopes()[0].getNode(getPreferenceNodeQualifier()).getBoolean(getProjectSettingsKey(), false);
-			EnableProjectSettings.setSelection(enabledForProject);
-		}
-		else {
-			Label spacer = new Label(checkLinkComposite, SWT.CHECK);
-			spacer.setLayoutData(new GridData());
-		}
-
-		ProjectSettingsLink = new Link(checkLinkComposite, SWT.NONE);
-		ProjectSettingsLink.setLayoutData(new GridData(SWT.END, SWT.BEGINNING, true, false));
-
-		/*
-		 * "element" should be a project, if null, link to per-project
-		 * properties
-		 */
-		if (getProject() != null) {
-			ProjectSettingsLink.setText("<a>" + SSEUIMessages.ConfigureWorkspaceSettings + "</a>"); //$NON-NLS-1$//$NON-NLS-2$
-		}
-		else {
-			ProjectSettingsLink.setText("<a>" + SSEUIMessages.ConfigureProjectSettings + "</a>"); //$NON-NLS-1$//$NON-NLS-2$
-		}
-
-		updateLinkEnablement();
-
-		ProjectSettingsLink.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				if (getProject() == null) {
-					openProjectSettings();
-				}
-				else {
-					openWorkspaceSettings();
-				}
-			}
-
-		});
-
-		if (getProject() != null) {
-			Label line = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
-			line.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-		}
-
-		Common = createCommonContents(composite);
-		
-		Common.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		if (EnableProjectSettings != null) {
-			SelectionAdapter selectionAdapter = new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					super.widgetSelected(e);
-					enablePreferenceContent(EnableProjectSettings.getSelection());
-				}
-			};
-			selectionAdapter.widgetSelected(null);
-			EnableProjectSettings.addSelectionListener(selectionAdapter);
-		}
-		
-		applyDialogFont(composite);
-		return composite;
-	}
-
-	protected IScopeContext[] createPreferenceScopes() {
-		IProject project = getProject();
-		if (project != null) {
-			return new IScopeContext[]{new ProjectScope(project), new InstanceScope(), new DefaultScope()};
-		}
-		return new IScopeContext[]{new InstanceScope(), new DefaultScope()};
-	}
-
-	protected abstract String getPreferenceNodeQualifier();
-
-	protected abstract String getPreferencePageID();
-
-	protected IProject getProject() {
-		if (getElement() != null) {
-			if (getElement() instanceof IProject) {
-				return (IProject) getElement();
-			}
-			Object adapter = getElement().getAdapter(IProject.class);
-			if (adapter instanceof IProject) {
-				return (IProject) adapter;
-			}
-			adapter = getElement().getAdapter(IResource.class);
-			if (adapter instanceof IProject) {
-				return (IProject) adapter;
-			}
-		}
-		return null;
-	}
-
-	protected abstract String getProjectSettingsKey();
-
-	protected abstract String getPropertyPageID();
-
-	protected boolean isElementSettingsEnabled() {
-		return EnableProjectSettings != null && EnableProjectSettings.getSelection();
-	}
-
-	void openProjectSettings() {
-		ListDialog dialog = new ListDialog(getShell()) {
-
-			protected Control createDialogArea(Composite container) {
-				Control area = super.createDialogArea(container);
-				getTableViewer().setSorter(new ResourceSorter(ResourceSorter.NAME));
-				return area;
-			}
-		};
-		dialog.setMessage(SSEUIMessages.PropertyPreferencePage_02);
-		dialog.setContentProvider(new IStructuredContentProvider() {
-			public void dispose() {
-			}
-
-			public Object[] getElements(Object inputElement) {
-				return ((IWorkspace) inputElement).getRoot().getProjects();
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			}
-		});
-		dialog.setLabelProvider(new DecoratingLabelProvider(new WorkbenchLabelProvider(), SSEUIPlugin.getDefault().getWorkbench().getDecoratorManager().getLabelDecorator()));
-		dialog.setInput(ResourcesPlugin.getWorkspace());
-		dialog.setTitle(SSEUIMessages.PropertyPreferencePage_01);
-		if (dialog.open() == Window.OK) {
-			Object[] result = dialog.getResult();
-			if (result.length > 0) {
-				IProject project = (IProject) dialog.getResult()[0];
-				Map data = new HashMap();
-				data.put(DISABLE_LINK, Boolean.TRUE);
-				PreferencesUtil.createPropertyDialogOn(getShell(), project, getPropertyPageID(), new String[]{getPropertyPageID()}, data).open();
-			}
-		}
-	}
-
-	void openWorkspaceSettings() {
-		Map data = new HashMap();
-		data.put(DISABLE_LINK, Boolean.TRUE);
-		PreferencesUtil.createPreferenceDialogOn(getShell(), getPreferencePageID(), new String[]{getPreferencePageID()}, data).open();
-	}
-
-	public boolean performOk() {
-		boolean ok = super.performOk();
-		IScopeContext[] preferenceScopes = createPreferenceScopes();
-		if (getProject() != null) {
-			if (isElementSettingsEnabled()) {
-				if (_debugPreferences) {
-					System.out.println(getClass().getName() + " setting " + TaskTagPreferenceKeys.TASK_TAG_PER_PROJECT + " (" + true + ") in scope " + preferenceScopes[0].getName() + ":" + preferenceScopes[0].getLocation()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$  
-				}
-				preferenceScopes[0].getNode(getPreferenceNodeQualifier()).putBoolean(getProjectSettingsKey(), EnableProjectSettings.getSelection());
-			}
-			else {
-				if (_debugPreferences) {
-					System.out.println(getClass().getName() + " removing " + TaskTagPreferenceKeys.TASK_TAG_PER_PROJECT + " from scope " + preferenceScopes[0].getName() + ":" + preferenceScopes[0].getLocation()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-				}
-				preferenceScopes[0].getNode(getPreferenceNodeQualifier()).remove(getProjectSettingsKey());
-			}
-		}
-		return ok;
-	}
-	
-	protected void performDefaults() {
-		if(getProject() != null && EnableProjectSettings != null) {
-			EnableProjectSettings.setSelection(false);
-			enablePreferenceContent(false);
-		}
-		super.performDefaults();
-	}
-
-	private void updateLinkEnablement() {
-		if (Data != null && ProjectSettingsLink != null) {
-			ProjectSettingsLink.setEnabled(!Boolean.TRUE.equals(Data.get(DISABLE_LINK)));
-		}
-	}
-	
-	/**
-	 * Controls the enablement of the common content region
-	 * of a property or preference page
-	 * 
-	 * @param enable the enabled state of the common content
-	 * area
-	 */
-	protected void enablePreferenceContent(boolean enable) {
-		if(enable) {
-			if(Enablements != null) {
-				Enablements.restore();
-				Enablements = null;
-			}
-		}
-		else {
-			if(Enablements == null)
-				Enablements = ControlEnableState.disable(Common);
-		}
-	}
-}
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 bc6da74..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/ValidationPreferencePage.java
+++ /dev/null
@@ -1,164 +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 java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-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.Text;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ScrolledPageContent;
-import org.eclipse.wst.xsl.core.ValidationPreferences;
-
-/**
- * Preference page for XSL validator preferences.
- * 
- * @author Doug Satchwell
- * @deprecated  This has been replaced by XSLValidationPreferencePage
- */
-public class ValidationPreferencePage extends AbstractXSLPreferencePage
-{
-	private static final String[] ERRORS = new String[] { "Error", "Warning", "Ignore" };
-	private static final int[] ERROR_VALUES = new int[] { IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO };
-	private static final Map<Integer, Integer> ERROR_MAP = new HashMap<Integer, Integer>();
-	private Text maxErrorsText;
-	private Map<String, Combo> combos = new HashMap<String, Combo>();
-
-	static
-	{
-		ERROR_MAP.put(IMarker.SEVERITY_ERROR, 0);
-		ERROR_MAP.put(IMarker.SEVERITY_WARNING, 1);
-		ERROR_MAP.put(IMarker.SEVERITY_INFO, 2);
-	}
-
-	/**
-	 * Create a new instance of this.
-	 */
-	public ValidationPreferencePage()
-	{
-		super();
-		// only used when page is shown programatically
-		setTitle("XSL Validation");
-		setDescription("Configure validation preferences");
-	}
-
-	protected Composite createCommonContents(Composite parent)
-	{
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 2;
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		
-		final ScrolledPageContent pageContent = new ScrolledPageContent(parent);
-		pageContent.setLayoutData(new GridData(GridData.FILL_BOTH));
-		pageContent.setExpandHorizontal(true);
-		pageContent.setExpandVertical(true);
-		
-		Composite body = pageContent.getBody();
-		body.setLayout(layout);
-
-		// PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.XML_PREFWEBX_FILES_HELPID);
-
-		createLabel(body, "Maximum number of errors reported per stylesheet:");
-		maxErrorsText = createTextField(body);
-		maxErrorsText.addModifyListener(this);
-
-		Composite twistie;
-		
-		twistie = createTwistie(body,"Imports and Includes",2);		
-		createCombo(twistie, "Unresolved include/import:", ValidationPreferences.MISSING_INCLUDE);
-		createCombo(twistie, "Circular references:", ValidationPreferences.CIRCULAR_REF);
-
-		twistie = createTwistie(body,"Named Templates",2);		
-		createCombo(twistie, "Template name conflicts:", ValidationPreferences.TEMPLATE_CONFLICT);
-		createCombo(twistie, "Duplicate parameterw:", ValidationPreferences.DUPLICATE_PARAMETER);
-		createCombo(twistie, "Parameter without name attribute:", ValidationPreferences.NAME_ATTRIBUTE_MISSING);
-		createCombo(twistie, "Parameter with empty name attribute:", ValidationPreferences.NAME_ATTRIBUTE_EMPTY);
-		
-		twistie = createTwistie(body,"Template Calls",2);		
-		createCombo(twistie, "Unresolved templates:", ValidationPreferences.CALL_TEMPLATES);
-		createCombo(twistie, "Missing parameters:", ValidationPreferences.MISSING_PARAM);
-		createCombo(twistie, "Parameters without value:", ValidationPreferences.EMPTY_PARAM);
-
-		twistie = createTwistie(body,"XPath Problems",2);
-		createCombo(twistie, "Incorrect XPath syntax:", ValidationPreferences.XPATHS);
-
-		return parent;
-	}
-
-	@Override
-	protected Combo createCombo(Composite parent, String label, String prefKey)
-	{
-		Combo combo = super.createCombo(parent, label, prefKey);
-		combo.setItems(ERRORS);
-		combos.put(prefKey, combo);
-		return combo;
-	}
-
-	@Override
-	protected void initializeValues()
-	{
-		int maxErrors = getModelPreferences().getInt(ValidationPreferences.MAX_ERRORS);
-		maxErrorsText.setText(String.valueOf(maxErrors));
-		for (Map.Entry<String, Combo> entry : combos.entrySet())
-		{
-			int val = getModelPreferences().getInt(entry.getKey());
-			entry.getValue().select(ERROR_MAP.get(val));
-		}
-	}
-
-	@Override
-	protected void storeValues()
-	{
-		int maxErrors = Integer.parseInt(maxErrorsText.getText());
-		getModelPreferences().setValue(ValidationPreferences.MAX_ERRORS, maxErrors);
-		for (Map.Entry<String, Combo> entry : combos.entrySet())
-		{
-			int index = entry.getValue().getSelectionIndex();
-			getModelPreferences().setValue(entry.getKey(), ERROR_VALUES[index]);
-		}
-	}
-
-	@Override
-	protected void validateValues()
-	{
-		String errorMessage = null;
-		try
-		{
-			int maxErrors = Integer.parseInt(maxErrorsText.getText());
-			if (maxErrors < 0)
-				errorMessage = "Max errors must be a positive integer";
-		}
-		catch (NumberFormatException e)
-		{
-			errorMessage = "Max errors must be a positive integer";
-		}
-		setErrorMessage(errorMessage);
-		setValid(errorMessage == null);
-	}
-
-	@Override
-	protected void performDefaults()
-	{
-		int maxErrors = getModelPreferences().getDefaultInt(ValidationPreferences.MAX_ERRORS);
-		maxErrorsText.setText(String.valueOf(maxErrors));
-		for (Map.Entry<String, Combo> entry : combos.entrySet())
-		{
-			int def = getModelPreferences().getDefaultInt(entry.getKey());
-			entry.getValue().select(ERROR_MAP.get(def));
-		}
-		super.performDefaults();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLPreferencesMessages.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLPreferencesMessages.java
deleted file mode 100644
index ef3154f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLPreferencesMessages.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 XSLPreferencesMessages {
-	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 XSLPreferencesMessages() {
-	}
-
-	/**
-	 * 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/XSLSyntaxColoringPage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLSyntaxColoringPage.java
deleted file mode 100755
index d786fa4..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLSyntaxColoringPage.java
+++ /dev/null
@@ -1,913 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.preference.ColorSelector;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-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.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-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.sse.ui.internal.SSEUIMessages;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.OverlayKey;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-import org.eclipse.wst.sse.ui.internal.util.EditorUtility;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-import org.eclipse.wst.xsl.ui.internal.style.IStyleConstantsXSL;
-import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
-
-import com.ibm.icu.text.Collator;
-
-/**
- * A preference page to configure our XSL syntax color. It resembles the XML
- * pages.
- * 
- * @since 1.0
- */
-public class XSLSyntaxColoringPage extends PreferencePage implements
-		IWorkbenchPreferencePage {
-
-	private static final String SYNTAXCOLORING_XSL = "syntaxcoloring.xsl"; //$NON-NLS-1$
-	private static final String XSLFILES_DIR = "xslfiles"; //$NON-NLS-1$
-	private Button bold;
-	private Label foregroundLabel;
-	private Label backgroundLabel;
-	private Button clearStyle;
-	private Map contextToXSLStyleMap;
-	private Color defaultForeground = null;
-	private Color defaultBackground = null;
-	private IStructuredDocument document;
-	private ColorSelector foregroundColorEditor;
-	private ColorSelector backgroundColorEditor;
-	private Button italic;
-	private OverlayPreferenceStore overlayStore;
-	private Button strike;
-	private Collection<String> stylePreferenceKeys;
-	private StructuredViewer stylesViewer = null;
-	private Map styleToDescriptionMap;
-	private StyledText styledText;
-	private Button underline;
-
-	// activate controls based on the given local color type
-	private void activate(String namedStyle) {
-		Color foreground = defaultForeground;
-		Color background = defaultBackground;
-		if (namedStyle == null) {
-			clearStyle.setEnabled(false);
-			bold.setEnabled(false);
-			italic.setEnabled(false);
-			strike.setEnabled(false);
-			underline.setEnabled(false);
-			foregroundLabel.setEnabled(false);
-			backgroundLabel.setEnabled(false);
-			foregroundColorEditor.setEnabled(false);
-			backgroundColorEditor.setEnabled(false);
-			bold.setSelection(false);
-			italic.setSelection(false);
-			strike.setSelection(false);
-			underline.setSelection(false);
-		} else {
-			TextAttribute attribute = getAttributeFor(namedStyle);
-			clearStyle.setEnabled(true);
-			bold.setEnabled(true);
-			italic.setEnabled(true);
-			strike.setEnabled(true);
-			underline.setEnabled(true);
-			foregroundLabel.setEnabled(true);
-			backgroundLabel.setEnabled(true);
-			foregroundColorEditor.setEnabled(true);
-			backgroundColorEditor.setEnabled(true);
-			bold.setSelection((attribute.getStyle() & SWT.BOLD) != 0);
-			italic.setSelection((attribute.getStyle() & SWT.ITALIC) != 0);
-			strike
-					.setSelection((attribute.getStyle() & TextAttribute.STRIKETHROUGH) != 0);
-			underline
-					.setSelection((attribute.getStyle() & TextAttribute.UNDERLINE) != 0);
-			if (attribute.getForeground() != null) {
-				foreground = attribute.getForeground();
-			}
-			if (attribute.getBackground() != null) {
-				background = attribute.getBackground();
-			}
-		}
-
-		foregroundColorEditor.setColorValue(foreground.getRGB());
-		backgroundColorEditor.setColorValue(background.getRGB());
-	}
-
-	/**
-	 * Color the text in the sample area according to the current preferences
-	 */
-	public void applyStyles() {
-		if (styledText == null || styledText.isDisposed())
-			return;
-		IStructuredDocumentRegion documentRegion = document
-				.getFirstStructuredDocumentRegion();
-
-		while (documentRegion != null) {
-			ITextRegionList regions = documentRegion.getRegions();
-			for (int i = 0; i < regions.size(); i++) {
-				ITextRegion currentRegion = regions.get(i);
-				// lookup the local coloring type and apply it
-				// This could be potentially expensive as we get the model and
-				// read it pretty consistently.
-				String namedStyle = null;
-				if (contextToXSLStyleMap.containsKey(currentRegion.getType())) {
-					namedStyle = (String) contextToXSLStyleMap
-							.get(currentRegion.getType());
-					if (namedStyle == null)
-						continue;
-					TextAttribute attribute = getAttributeFor(namedStyle);
-					if (attribute == null)
-						continue;
-					StyleRange style = new StyleRange(documentRegion
-							.getStartOffset(currentRegion), currentRegion
-							.getTextLength(), attribute.getForeground(),
-							attribute.getBackground(), attribute.getStyle());
-					style.strikeout = (attribute.getStyle() & TextAttribute.STRIKETHROUGH) != 0;
-					style.underline = (attribute.getStyle() & TextAttribute.UNDERLINE) != 0;
-					styledText.setStyleRange(style);
-				}
-			}
-			documentRegion = documentRegion.getNext();
-		}
-	}
-
-	public Button createCheckbox(Composite parent, String label) {
-		Button button = new Button(parent, SWT.CHECK);
-		button.setText(label);
-		button.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		return button;
-	}
-
-	/**
-	 * Creates composite control and sets the default layout data.
-	 */
-	private Composite createComposite(Composite parent, int numColumns) {
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		layout.makeColumnsEqualWidth = false;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-
-		// GridData
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false);
-		composite.setLayoutData(data);
-		return composite;
-	}
-
-	protected Control createContents(final Composite parent) {
-		initializeDialogUnits(parent);
-
-		defaultForeground = parent.getDisplay().getSystemColor(
-				SWT.COLOR_LIST_FOREGROUND);
-		defaultBackground = parent.getDisplay().getSystemColor(
-				SWT.COLOR_LIST_BACKGROUND);
-		Composite pageComponent = createComposite(parent, 2);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent,
-				IHelpContextIds.XML_PREFWEBX_STYLES_HELPID);
-
-		Link link = new Link(pageComponent, SWT.WRAP);
-		//String linkText = SSEUIMessages.SyntaxColoring_Description + XSLPreferencesMessages.getString("XSLSyntaxColoringPage.2"); //$NON-NLS-1$
-		link.setText(XSLPreferencesMessages.getString("XSLSyntaxColoringPage.2"));
-		link.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				PreferencesUtil.createPreferenceDialogOn(parent.getShell(),
-						e.text, null, null);
-			}
-		});
-
-		GridData linkData = new GridData(SWT.FILL, SWT.BEGINNING, true, false,
-				2, 1);
-		linkData.widthHint = 150; // only expand further if anyone else requires
-									// it
-		link.setLayoutData(linkData);
-
-		new Label(pageComponent, SWT.NONE).setLayoutData(new GridData());
-		new Label(pageComponent, SWT.NONE).setLayoutData(new GridData());
-
-		SashForm editor = new SashForm(pageComponent, SWT.VERTICAL);
-		GridData gridData2 = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData2.horizontalSpan = 2;
-		editor.setLayoutData(gridData2);
-		SashForm top = new SashForm(editor, SWT.HORIZONTAL);
-		Composite styleEditor = createComposite(top, 1);
-		((GridLayout) styleEditor.getLayout()).marginRight = 5;
-		((GridLayout) styleEditor.getLayout()).marginLeft = 0;
-		createLabel(styleEditor, XMLUIMessages.SyntaxColoringPage_0);
-		stylesViewer = createStylesViewer(styleEditor);
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData.horizontalIndent = 0;
-		Iterator iterator = styleToDescriptionMap.values().iterator();
-		while (iterator.hasNext()) {
-			gridData.widthHint = Math.max(gridData.widthHint,
-					convertWidthInCharsToPixels(iterator.next().toString()
-							.length()));
-		}
-		gridData.heightHint = convertHeightInCharsToPixels(5);
-		stylesViewer.getControl().setLayoutData(gridData);
-
-		Composite editingComposite = createComposite(top, 1);
-		((GridLayout) styleEditor.getLayout()).marginLeft = 5;
-		createLabel(editingComposite, ""); //$NON-NLS-1$
-		Button enabler = createCheckbox(editingComposite,
-				XMLUIMessages.SyntaxColoringPage_2);
-		enabler.setEnabled(false);
-		enabler.setSelection(true);
-		Composite editControls = createComposite(editingComposite, 2);
-		((GridLayout) editControls.getLayout()).marginLeft = 20;
-
-		foregroundLabel = createLabel(editControls,
-				SSEUIMessages.Foreground_UI_);
-		((GridData) foregroundLabel.getLayoutData()).verticalAlignment = SWT.CENTER;
-		foregroundLabel.setEnabled(false);
-
-		foregroundColorEditor = new ColorSelector(editControls);
-		Button fForegroundColor = foregroundColorEditor.getButton();
-		GridData gd = new GridData(SWT.BEGINNING, SWT.FILL, false, false);
-		fForegroundColor.setLayoutData(gd);
-		foregroundColorEditor.setEnabled(false);
-
-		backgroundLabel = createLabel(editControls,
-				SSEUIMessages.Background_UI_);
-		((GridData) backgroundLabel.getLayoutData()).verticalAlignment = SWT.CENTER;
-		backgroundLabel.setEnabled(false);
-
-		backgroundColorEditor = new ColorSelector(editControls);
-		Button fBackgroundColor = backgroundColorEditor.getButton();
-		gd = new GridData(SWT.BEGINNING, SWT.FILL, false, false);
-		fBackgroundColor.setLayoutData(gd);
-		backgroundColorEditor.setEnabled(false);
-
-		bold = createCheckbox(editControls, XMLUIMessages.SyntaxColoringPage_3);
-		bold.setEnabled(false);
-		((GridData) bold.getLayoutData()).horizontalSpan = 2;
-		italic = createCheckbox(editControls,
-				XMLUIMessages.SyntaxColoringPage_4);
-		italic.setEnabled(false);
-		((GridData) italic.getLayoutData()).horizontalSpan = 2;
-		strike = createCheckbox(editControls,
-				XMLUIMessages.SyntaxColoringPage_5);
-		strike.setEnabled(false);
-		((GridData) strike.getLayoutData()).horizontalSpan = 2;
-		underline = createCheckbox(editControls,
-				XMLUIMessages.SyntaxColoringPage_6);
-		underline.setEnabled(false);
-		((GridData) underline.getLayoutData()).horizontalSpan = 2;
-		clearStyle = new Button(editingComposite, SWT.PUSH);
-		clearStyle.setText(SSEUIMessages.Restore_Default_UI_); //$NON-NLS-1$ = "Restore Default"
-		clearStyle.setLayoutData(new GridData(SWT.BEGINNING));
-		((GridData) clearStyle.getLayoutData()).horizontalIndent = 20;
-		clearStyle.setEnabled(false);
-
-		Composite sampleArea = createComposite(editor, 1);
-
-		((GridLayout) sampleArea.getLayout()).marginLeft = 5;
-		((GridLayout) sampleArea.getLayout()).marginTop = 5;
-		createLabel(sampleArea, SSEUIMessages.Sample_text__UI_); //$NON-NLS-1$ = "&Sample text:"
-		SourceViewer viewer = new SourceViewer(sampleArea, null, SWT.BORDER
-				| SWT.LEFT_TO_RIGHT | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL
-				| SWT.READ_ONLY);
-		styledText = viewer.getTextWidget();
-		GridData gridData3 = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData3.widthHint = convertWidthInCharsToPixels(20);
-		gridData3.heightHint = convertHeightInCharsToPixels(5);
-		gridData3.horizontalSpan = 2;
-		styledText.setLayoutData(gridData3);
-		styledText.setEditable(false);
-		styledText.setFont(JFaceResources
-				.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
-		styledText.addKeyListener(getTextKeyListener());
-		styledText.addSelectionListener(getTextSelectionListener());
-		styledText.addMouseListener(getTextMouseListener());
-		styledText.addTraverseListener(getTraverseListener());
-		setAccessible(styledText, SSEUIMessages.Sample_text__UI_);
-
-		try {
-			File file = XSLUIPlugin.makeFileFor(this.XSLFILES_DIR,
-					this.SYNTAXCOLORING_XSL);
-			document = StructuredModelManager.getModelManager()
-					.createStructuredDocumentFor(file.getAbsolutePath(),
-							new FileInputStream(file), null);
-		} catch (Exception ex) {
-			XSLUIPlugin.log(ex);
-		}
-		viewer.setDocument(document);
-
-		top.setWeights(new int[] { 1, 1 });
-		editor.setWeights(new int[] { 1, 1 });
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent,
-				IHelpContextIds.XML_PREFWEBX_STYLES_HELPID);
-
-		stylesViewer.setInput(getStylePreferenceKeys());
-
-		applyStyles();
-
-		stylesViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						if (!event.getSelection().isEmpty()) {
-							Object o = ((IStructuredSelection) event
-									.getSelection()).getFirstElement();
-							String namedStyle = o.toString();
-							activate(namedStyle);
-							if (namedStyle == null)
-								return;
-						}
-					}
-				});
-
-		foregroundColorEditor.addListener(new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				if (event.getProperty().equals(ColorSelector.PROP_COLORCHANGE)) {
-					Object o = ((IStructuredSelection) stylesViewer
-							.getSelection()).getFirstElement();
-					String namedStyle = o.toString();
-					String prefString = getOverlayStore().getString(namedStyle);
-					String[] stylePrefs = ColorHelper
-							.unpackStylePreferences(prefString);
-					if (stylePrefs != null) {
-						String oldValue = stylePrefs[0];
-						// open color dialog to get new color
-						String newValue = ColorHelper
-								.toRGBString(foregroundColorEditor
-										.getColorValue());
-
-						if (!newValue.equals(oldValue)) {
-							stylePrefs[0] = newValue;
-							String newPrefString = ColorHelper
-									.packStylePreferences(stylePrefs);
-							getOverlayStore().setValue(namedStyle,
-									newPrefString);
-							applyStyles();
-							styledText.redraw();
-						}
-					}
-				}
-			}
-		});
-
-		backgroundColorEditor.addListener(new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				if (event.getProperty().equals(ColorSelector.PROP_COLORCHANGE)) {
-					Object o = ((IStructuredSelection) stylesViewer
-							.getSelection()).getFirstElement();
-					String namedStyle = o.toString();
-					String prefString = getOverlayStore().getString(namedStyle);
-					String[] stylePrefs = ColorHelper
-							.unpackStylePreferences(prefString);
-					if (stylePrefs != null) {
-						String oldValue = stylePrefs[1];
-						// open color dialog to get new color
-						String newValue = ColorHelper
-								.toRGBString(backgroundColorEditor
-										.getColorValue());
-
-						if (!newValue.equals(oldValue)) {
-							stylePrefs[1] = newValue;
-							String newPrefString = ColorHelper
-									.packStylePreferences(stylePrefs);
-							getOverlayStore().setValue(namedStyle,
-									newPrefString);
-							applyStyles();
-							styledText.redraw();
-							activate(namedStyle);
-						}
-					}
-				}
-			}
-		});
-
-		bold.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) stylesViewer.getSelection())
-						.getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper
-						.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[2];
-					String newValue = String.valueOf(bold.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[2] = newValue;
-						String newPrefString = ColorHelper
-								.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						styledText.redraw();
-					}
-				}
-			}
-		});
-
-		italic.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) stylesViewer.getSelection())
-						.getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper
-						.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[3];
-					String newValue = String.valueOf(italic.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[3] = newValue;
-						String newPrefString = ColorHelper
-								.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						styledText.redraw();
-					}
-				}
-			}
-		});
-
-		strike.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) stylesViewer.getSelection())
-						.getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper
-						.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[4];
-					String newValue = String.valueOf(strike.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[4] = newValue;
-						String newPrefString = ColorHelper
-								.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						styledText.redraw();
-					}
-				}
-			}
-		});
-
-		underline.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) stylesViewer.getSelection())
-						.getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper
-						.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[5];
-					String newValue = String.valueOf(underline.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[5] = newValue;
-						String newPrefString = ColorHelper
-								.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						styledText.redraw();
-					}
-				}
-			}
-		});
-
-		clearStyle.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (stylesViewer.getSelection().isEmpty())
-					return;
-				String namedStyle = ((IStructuredSelection) stylesViewer
-						.getSelection()).getFirstElement().toString();
-				getOverlayStore().setToDefault(namedStyle);
-				applyStyles();
-				styledText.redraw();
-				activate(namedStyle);
-			}
-		});
-
-		return pageComponent;
-	}
-
-	private Label createLabel(Composite parent, String text) {
-		Label label = new Label(parent, SWT.WRAP);
-		label.setText(text);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, false, false);
-		label.setLayoutData(data);
-		label.setBackground(parent.getBackground());
-		return label;
-	}
-
-	// protected Label createDescriptionLabel(Composite parent) {
-	// return null;
-	// }
-
-	/**
-	 * Set up all the style preference keys in the overlay store
-	 */
-	private OverlayKey[] createOverlayStoreKeys() {
-		List overlayKeys = new ArrayList();
-
-		Iterator i = getStylePreferenceKeys().iterator();
-		while (i.hasNext()) {
-			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(
-					OverlayPreferenceStore.STRING, (String) i.next()));
-		}
-
-		OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys
-				.size()];
-		overlayKeys.toArray(keys);
-		return keys;
-	}
-
-	/**
-	 * Creates the List viewer where we see the various syntax element display
-	 * names--would it ever be a Tree like JDT's?
-	 * 
-	 * @param parent
-	 * @return
-	 */
-	private StructuredViewer createStylesViewer(Composite parent) {
-		StructuredViewer stylesViewer = new ListViewer(parent, SWT.SINGLE
-				| SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
-		stylesViewer
-				.setComparator(new ViewerComparator(Collator.getInstance()));
-		stylesViewer.setLabelProvider(new LabelProvider() {
-			public String getText(Object element) {
-				Object description = styleToDescriptionMap.get(element);
-				if (description != null)
-					return description.toString();
-				return super.getText(element);
-			}
-		});
-		stylesViewer.setContentProvider(new ITreeContentProvider() {
-			public void dispose() {
-			}
-
-			public Object[] getChildren(Object parentElement) {
-				return getStylePreferenceKeys().toArray();
-			}
-
-			public Object[] getElements(Object inputElement) {
-				return getChildren(inputElement);
-			}
-
-			public Object getParent(Object element) {
-				return getStylePreferenceKeys();
-			}
-
-			public boolean hasChildren(Object element) {
-				return false;
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput,
-					Object newInput) {
-			}
-		});
-		return stylesViewer;
-	}
-
-	public void dispose() {
-		if (overlayStore != null) {
-			overlayStore.stop();
-		}
-		super.dispose();
-	}
-
-	protected IPreferenceStore doGetPreferenceStore() {
-		return XSLUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	private TextAttribute getAttributeFor(String namedStyle) {
-		TextAttribute ta = new TextAttribute(defaultForeground,
-				defaultBackground, SWT.NORMAL);
-
-		if (namedStyle != null && overlayStore != null) {
-			// note: "namedStyle" *is* the preference key
-			String prefString = getOverlayStore().getString(namedStyle);
-			String[] stylePrefs = ColorHelper
-					.unpackStylePreferences(prefString);
-			if (stylePrefs != null) {
-				RGB foreground = ColorHelper.toRGB(stylePrefs[0]);
-				RGB background = ColorHelper.toRGB(stylePrefs[1]);
-
-				int fontModifier = SWT.NORMAL;
-
-				if (stylePrefs.length > 2) {
-					boolean on = Boolean.valueOf(stylePrefs[2]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | SWT.BOLD;
-				}
-				if (stylePrefs.length > 3) {
-					boolean on = Boolean.valueOf(stylePrefs[3]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | SWT.ITALIC;
-				}
-				if (stylePrefs.length > 4) {
-					boolean on = Boolean.valueOf(stylePrefs[4]).booleanValue();
-					if (on)
-						fontModifier = fontModifier
-								| TextAttribute.STRIKETHROUGH;
-				}
-				if (stylePrefs.length > 5) {
-					boolean on = Boolean.valueOf(stylePrefs[5]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | TextAttribute.UNDERLINE;
-				}
-
-				ta = new TextAttribute((foreground != null) ? EditorUtility
-						.getColor(foreground) : null,
-						(background != null) ? EditorUtility
-								.getColor(background) : null, fontModifier);
-			}
-		}
-		return ta;
-	}
-
-	private String getNamedStyleAtOffset(int offset) {
-		// ensure the offset is clean
-		if (offset >= document.getLength())
-			return getNamedStyleAtOffset(document.getLength() - 1);
-		else if (offset < 0)
-			return getNamedStyleAtOffset(0);
-		IStructuredDocumentRegion documentRegion = document
-				.getFirstStructuredDocumentRegion();
-		while (documentRegion != null && !documentRegion.containsOffset(offset)) {
-			documentRegion = documentRegion.getNext();
-		}
-		if (documentRegion != null) {
-			// find the ITextRegion's Context at this offset
-			ITextRegion interest = documentRegion
-					.getRegionAtCharacterOffset(offset);
-			if (interest == null)
-				return null;
-			if (offset > documentRegion.getTextEndOffset(interest))
-				return null;
-			String regionContext = interest.getType();
-			if (regionContext == null)
-				return null;
-			// find the named style (internal/selectable name) for that
-			// context
-			String namedStyle = (String) contextToXSLStyleMap.get(regionContext);
-			if (namedStyle != null) {
-				return namedStyle;
-			}
-		}
-		return null;
-	}
-
-	private OverlayPreferenceStore getOverlayStore() {
-		return overlayStore;
-	}
-
-	private Collection<String> getStylePreferenceKeys() {
-		if (stylePreferenceKeys == null) {
-			List<String> styles = new ArrayList<String>();
-			styles.add(IStyleConstantsXSL.TAG_BORDER);
-			styles.add(IStyleConstantsXSL.TAG_NAME);
-			styles.add(IStyleConstantsXSL.TAG_ATTRIBUTE_NAME);
-			styles.add(IStyleConstantsXSL.TAG_ATTRIBUTE_VALUE);
-			stylePreferenceKeys = styles;
-		}
-		return stylePreferenceKeys;
-	}
-
-	private KeyListener getTextKeyListener() {
-		return new KeyListener() {
-			public void keyPressed(KeyEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-
-			public void keyReleased(KeyEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-		};
-	}
-
-	private MouseListener getTextMouseListener() {
-		return new MouseListener() {
-			public void mouseDoubleClick(MouseEvent e) {
-			}
-
-			public void mouseDown(MouseEvent e) {
-			}
-
-			public void mouseUp(MouseEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-		};
-	}
-
-	private SelectionListener getTextSelectionListener() {
-		return new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				selectColorAtOffset(e.x);
-				if (e.widget instanceof StyledText) {
-					((StyledText) e.widget).setSelection(e.x);
-				}
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				selectColorAtOffset(e.x);
-				if (e.widget instanceof StyledText) {
-					((StyledText) e.widget).setSelection(e.x);
-				}
-			}
-		};
-	}
-
-	private TraverseListener getTraverseListener() {
-		return new TraverseListener() {
-			/**
-			 * @see org.eclipse.swt.events.TraverseListener#keyTraversed(TraverseEvent)
-			 */
-			public void keyTraversed(TraverseEvent e) {
-				if (e.widget instanceof StyledText) {
-					if ((e.detail == SWT.TRAVERSE_TAB_NEXT)
-							|| (e.detail == SWT.TRAVERSE_TAB_PREVIOUS))
-						e.doit = true;
-				}
-			}
-		};
-	}
-
-	public void init(IWorkbench workbench) {
-		setDescription(SSEUIMessages.SyntaxColoring_Description);
-
-		styleToDescriptionMap = new HashMap();
-		contextToXSLStyleMap = new HashMap();
-
-		initStyleToDescriptionMap();
-		initRegionContextToStyleMap();
-
-		overlayStore = new OverlayPreferenceStore(getPreferenceStore(),
-				createOverlayStoreKeys());
-		overlayStore.load();
-		overlayStore.start();
-	}
-
-	private void initRegionContextToStyleMap() {
-		xslContextToStyleMap();
-	}
-
-
-	@SuppressWarnings("unchecked")
-	private void xslContextToStyleMap() {
-		contextToXSLStyleMap.put(DOMRegionContext.XML_TAG_OPEN,
-				IStyleConstantsXSL.TAG_BORDER);
-		contextToXSLStyleMap.put(DOMRegionContext.XML_END_TAG_OPEN,
-				IStyleConstantsXSL.TAG_BORDER);
-		contextToXSLStyleMap.put(DOMRegionContext.XML_TAG_NAME,
-				IStyleConstantsXSL.TAG_NAME);
-		contextToXSLStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME,
-				IStyleConstantsXSL.TAG_ATTRIBUTE_NAME);
-		contextToXSLStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE,
-				IStyleConstantsXSL.TAG_ATTRIBUTE_VALUE);
-		contextToXSLStyleMap.put(DOMRegionContext.XML_TAG_CLOSE,
-				IStyleConstantsXSL.TAG_BORDER);
-		contextToXSLStyleMap.put(DOMRegionContext.XML_EMPTY_TAG_CLOSE,
-				IStyleConstantsXSL.TAG_BORDER);
-	}
-
-	@SuppressWarnings("unchecked")
-	private void initStyleToDescriptionMap() {
-		styleToDescriptionMap.put(IStyleConstantsXSL.TAG_BORDER,
-				XMLUIMessages.Tag_Delimiters_UI_);
-		styleToDescriptionMap.put(IStyleConstantsXSL.TAG_NAME,
-				XMLUIMessages.Tag_Names_UI_);
-		styleToDescriptionMap.put(IStyleConstantsXSL.TAG_ATTRIBUTE_NAME,
-				XMLUIMessages.Attribute_Names_UI_);
-		styleToDescriptionMap.put(IStyleConstantsXSL.TAG_ATTRIBUTE_VALUE,
-				XMLUIMessages.Attribute_Values_UI_);
-	}
-
-	protected void performDefaults() {
-		super.performDefaults();
-		getOverlayStore().loadDefaults();
-		applyStyles();
-		stylesViewer.setSelection(StructuredSelection.EMPTY);
-		activate(null);
-		styledText.redraw();
-	}
-
-	public boolean performOk() {
-		getOverlayStore().propagate();
-
-		XSLUIPlugin.getDefault().savePluginPreferences();
-		SSEUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-
-	private void selectColorAtOffset(int offset) {
-		String namedStyle = getNamedStyleAtOffset(offset);
-		if (namedStyle != null) {
-			stylesViewer.setSelection(new StructuredSelection(namedStyle));
-			stylesViewer.reveal(namedStyle);
-		} else {
-			stylesViewer.setSelection(StructuredSelection.EMPTY);
-		}
-		activate(namedStyle);
-	}
-
-	/**
-	 * Specifically set the reporting name of a control for accessibility
-	 */
-	private void setAccessible(Control control, String name) {
-		if (control == null)
-			return;
-		final String n = name;
-		control.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-			public void getName(AccessibleEvent e) {
-				if (e.childID == ACC.CHILDID_SELF)
-					e.result = n;
-			}
-		});
-	}
-}
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/XSLUIPreferenceInitializer.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLUIPreferenceInitializer.java
deleted file mode 100755
index 53b5e1f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLUIPreferenceInitializer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Benjamin Muskalla, b.muskalla@gmx.net - [158660] character entities should have their own syntax highlighting preference 
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ColorRegistry;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-
-import org.eclipse.wst.xsl.core.internal.XSLCorePlugin;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-import org.eclipse.wst.xsl.ui.internal.style.IStyleConstantsXSL;
-
-/**
- * Sets default values for XML UI preferences
- */
-public class XSLUIPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = XSLUIPlugin.getDefault().getPreferenceStore();
-		ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
-
-
-		// XSL Style Preferences
-		String BOLD = " | null | true"; //$NON-NLS-1$
-		String JUSTITALIC = " | null | false | true"; //$NON-NLS-1$
-		String styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXSL.TAG_ATTRIBUTE_NAME, 127, 0, 127) + BOLD;
-		store.setDefault(IStyleConstantsXSL.TAG_ATTRIBUTE_NAME, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXSL.TAG_ATTRIBUTE_VALUE, 42, 0, 255) + JUSTITALIC;
-		store.setDefault(IStyleConstantsXSL.TAG_ATTRIBUTE_VALUE, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXSL.TAG_BORDER, 0, 128, 128) + BOLD;
-		store.setDefault(IStyleConstantsXSL.TAG_BORDER, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXSL.TAG_NAME, 63, 127, 127) + BOLD;
-		store.setDefault(IStyleConstantsXSL.TAG_NAME, styleValue);
-		
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLValidationPreferencePage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLValidationPreferencePage.java
deleted file mode 100644
index 51a30c1..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLValidationPreferencePage.java
+++ /dev/null
@@ -1,338 +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 - bug 230072 - initial API and implementation based on code from
- *                                Doug Satchwell, Jesper Moeller, and the
- *                                HTML Validation PreferencePage.
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.forms.events.ExpansionAdapter;
-import org.eclipse.ui.forms.events.ExpansionEvent;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ScrolledPageContent;
-import org.eclipse.wst.sse.ui.internal.util.PixelConverter;
-import org.eclipse.wst.xsl.core.ValidationPreferences;
-import org.eclipse.wst.xsl.core.internal.XSLCorePlugin;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-public class XSLValidationPreferencePage extends AbstractValidationSettingsPage implements ModifyListener {
-
-	private static final String[] ERRORS = new String[] { "Error", "Warning", "Ignore" };
-	private static final int[] ERROR_VALUES = new int[] { IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO };
-	private static final Map<Integer, Integer> ERROR_MAP = new HashMap<Integer, Integer>();
-	private Text maxErrorsText;
-	private Map<String, Combo> combos = new HashMap<String, Combo>();
-	private List<ExpandableComposite> Expandables = new ArrayList<ExpandableComposite>();
-	private static final String SETTINGS_SECTION_NAME = "XSLValidationSeverities";//$NON-NLS-1$
-	private PixelConverter fPixelConverter;
-
-
-	static
-	{
-		ERROR_MAP.put(IMarker.SEVERITY_ERROR, 0);
-		ERROR_MAP.put(IMarker.SEVERITY_WARNING, 1);
-		ERROR_MAP.put(IMarker.SEVERITY_INFO, 2);
-	}
-	
-	protected Control createCommonContents(Composite parent) {
-		final Composite page = new Composite(parent, SWT.NULL);
-		
-		//GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		page.setLayout(layout);
-		
-		fPixelConverter = new PixelConverter(parent);
-		
-		final Composite content = createValidationSection(page);
-
-		loadPreferences();
-		restoreSectionExpansionStates(getDialogSettings().getSection(SETTINGS_SECTION_NAME));
-		
-		GridData gridData= new GridData(GridData.FILL, GridData.FILL, true, true);
-		gridData.heightHint = fPixelConverter.convertHeightInCharsToPixels(20);
-		content.setLayoutData(gridData);
-		
-		return page;
-	}
-	
-	protected Composite createValidationSection(Composite parent)
-	{
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 2;
-		layout.marginHeight= 0;
-		layout.marginWidth= 0;
-		
-		final ScrolledPageContent pageContent = new ScrolledPageContent(parent);
-		pageContent.setLayoutData(new GridData(GridData.FILL_BOTH));
-		pageContent.setExpandHorizontal(true);
-		pageContent.setExpandVertical(true);
-		
-		Composite body = pageContent.getBody();
-		body.setLayout(layout);
-
-		GridData gd= new GridData(GridData.FILL, GridData.CENTER, true, false, 2, 1);
-		gd.horizontalIndent= 0;
-
-		Label description = new Label(body, SWT.NONE);
-		description.setText("Select the serverity level for the following validation problems:");
-		description.setFont(pageContent.getFont());
-		description.setLayoutData(gd);
-		
-
-		createLabel(body, "Maximum number of errors reported per stylesheet:");
-		maxErrorsText = createTextField(body);
-		maxErrorsText.addModifyListener(this);
-
-		ExpandableComposite twistie;
-		
-		int columns = 3;
-		twistie = createTwistie(body,"Imports and Includes",columns);
-		Composite inner = createInnerComposite(parent, twistie, columns);
-		
-		String label = "Unresolved include/import:";
-		createCombo(inner, label, ValidationPreferences.MISSING_INCLUDE);
-
-		label = "Unresolved include/import:";
-		inner = createInnerComposite(parent, twistie, columns);
-		createCombo(inner, label, ValidationPreferences.MISSING_INCLUDE);
-		createCombo(inner, "Circular references:", ValidationPreferences.CIRCULAR_REF);
-
-		twistie = createTwistie(body,"Named Templates",columns);
-		inner = createInnerComposite(parent, twistie, columns);
-		
-		createCombo(inner, "Template name conflicts:", ValidationPreferences.TEMPLATE_CONFLICT);
-		createCombo(inner, "Duplicate parameterw:", ValidationPreferences.DUPLICATE_PARAMETER);
-		createCombo(inner, "Parameter without name attribute:", ValidationPreferences.NAME_ATTRIBUTE_MISSING);
-		createCombo(inner, "Parameter with empty name attribute:", ValidationPreferences.NAME_ATTRIBUTE_EMPTY);
-		
-		twistie = createTwistie(body,"Template Calls",columns);
-		inner = createInnerComposite(parent, twistie, columns);
-		
-		createCombo(inner, "Unresolved templates:", ValidationPreferences.CALL_TEMPLATES);
-		createCombo(inner, "Missing parameters:", ValidationPreferences.MISSING_PARAM);
-		createCombo(inner, "Parameters without value:", ValidationPreferences.EMPTY_PARAM);
-
-		twistie = createTwistie(body,"XPath Problems",columns);
-		inner = createInnerComposite(parent, twistie, columns);
-		createCombo(inner, "Incorrect XPath syntax:", ValidationPreferences.XPATHS);
-		
-		return parent;
-	}
-
-	private Composite createInnerComposite(Composite parent,
-			ExpandableComposite twistie, int columns) {
-		Composite inner = new Composite(twistie, SWT.NONE);
-		inner.setFont(parent.getFont());
-		inner.setLayout(new GridLayout(columns, false));
-		twistie.setClient(inner);
-		return inner;
-	}
-	
-	protected Combo createCombo(Composite parent, String label, String key) {
-		return addComboBox(parent, label, key, ERROR_VALUES, ERRORS, 0);
-	}
-	
-	protected Label createLabel(Composite parent, String text) {
-		Label label = new Label(parent, SWT.LEFT);
-		label.setText(text);
-
-
-		//GridData
-		GridData data = new GridData(GridData.FILL);
-		data.verticalAlignment = GridData.CENTER;
-		data.horizontalAlignment = GridData.FILL;
-		label.setLayoutData(data);
-
-		return label;
-	}
-	
-	protected Text createTextField(Composite parent) {
-		Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
-
-		//GridData
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.CENTER;
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		text.setLayoutData(data);
-
-		return text;
-	}
-	
-	protected ExpandableComposite createTwistie(Composite parent, String label, int nColumns) {
-		ExpandableComposite excomposite= new ExpandableComposite(parent, SWT.NONE, ExpandableComposite.TWISTIE | ExpandableComposite.CLIENT_INDENT);
-		excomposite.setText(label);
-		excomposite.setExpanded(false);
-		excomposite.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
-		excomposite.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, nColumns, 1));
-		excomposite.addExpansionListener(new ExpansionAdapter() {
-			public void expansionStateChanged(ExpansionEvent e) {
-				expandedStateChanged((ExpandableComposite) e.getSource());
-			}
-		});
-		Expandables.add(excomposite);
-		makeScrollableCompositeAware(excomposite);
-		return excomposite;
-	}
-	
-	private void makeScrollableCompositeAware(Control control)
-	{
-		ScrolledPageContent parentScrolledComposite = getParentScrolledComposite(control);
-		if (parentScrolledComposite != null)
-		{
-			parentScrolledComposite.adaptChild(control);
-		}
-	}
-	
-	@Override
-	public void dispose() {
-		storeSectionExpansionStates(getDialogSettings().addNewSection(SETTINGS_SECTION_NAME));
-		super.dispose();
-	}
-	
-	protected String getQualifier() {
-		return XSLCorePlugin.getDefault().getBundle().getSymbolicName();
-	}
-	
-	@Override
-	protected String getPreferenceNodeQualifier() {
-		return XSLCorePlugin.getDefault().getBundle().getSymbolicName();
-	}
-
-	@Override
-	protected String getPreferencePageID() {
-		return "org.eclipse.wst.xsl.ui.preferences.Validation";
-	}
-
-	@Override
-	protected String getProjectSettingsKey() {
-		return XSLCorePlugin.USE_PROJECT_SETTINGS;
-	}
-	
-	protected IDialogSettings getDialogSettings() {
-		return XSLUIPlugin.getDefault().getDialogSettings();
-	}	
-
-	@Override
-	protected String getPropertyPageID() {
-		return "org.eclipse.wst.xsl.ui.propertyPage.project.validation";
-	}
-
-	public void init(IWorkbench workbench) {
-
-	}
-
-	public void modifyText(ModifyEvent e) {
-		// If we are called too early, i.e. before the controls are created
-		// then return
-		// to avoid null pointer exceptions
-		if (e.widget != null && e.widget.isDisposed())
-			return;
-
-		validateValues();
-		enableValues();
-	}
-
-
-	@Override
-	protected void storeValues()
-	{
-		int maxErrors = Integer.parseInt(maxErrorsText.getText());
-		getModelPreferences().setValue(ValidationPreferences.MAX_ERRORS, maxErrors);
-		for (Map.Entry<String, Combo> entry : combos.entrySet())
-		{
-			int index = entry.getValue().getSelectionIndex();
-			getModelPreferences().setValue(entry.getKey(), ERROR_VALUES[index]);
-		}
-		super.storeValues();
-	}
-	
-	protected Preferences getModelPreferences()
-	{
-		return XSLCorePlugin.getDefault().getPluginPreferences();
-	}
-
-	protected boolean loadPreferences() {
-		BusyIndicator.showWhile(getControl().getDisplay(), new Runnable() {
-			public void run() {
-				initializeValues();
-				validateValues();
-				enableValues();
-			}
-		});
-		return true;
-	}
-	
-	protected void initializeValues()
-	{
-		int maxErrors = getModelPreferences().getInt(ValidationPreferences.MAX_ERRORS);
-		maxErrorsText.setText(String.valueOf(maxErrors));
-		for (Map.Entry<String, Combo> entry : combos.entrySet())
-		{
-			int val = getModelPreferences().getInt(entry.getKey());
-			entry.getValue().select(ERROR_MAP.get(val));
-		}
-	}
-	
-	protected void validateValues()
-	{
-		String errorMessage = null;
-		try
-		{
-			int maxErrors = Integer.parseInt(maxErrorsText.getText());
-			if (maxErrors < 0)
-				errorMessage = "Max errors must be a positive integer";
-		}
-		catch (NumberFormatException e)
-		{
-			errorMessage = "Max errors must be a positive integer";
-		}
-		setErrorMessage(errorMessage);
-		setValid(errorMessage == null);
-	}	
-	
-	protected void enableValues() {
-	}	
-	
-	protected void performDefaults() {
-		resetSeverities();
-		super.performDefaults();
-	}
-	
-	/** (non-Javadoc)
-	 * @see org.eclipse.wst.xsl.ui.internal.preferences.AbstractValidationSettingsPage#performOk()
-	 */
-	public boolean performOk() {
-		boolean result = super.performOk();
-		storeValues();
-		return result;
-	}	
-}
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 d5b11c7..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-MainPreferencePage.0=Expand the tree to set preferences 
-XSLSyntaxColoringPage.2=\nDefault colors and fonts for <a href="org.eclipse.wst.sse.ui.preferences.xml.colors">XML</a> can be configured on the XML Sytnax Coloring page.  Settings on this page only affect XSLT content.
-xsltStyleDocument=<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">\n <xsl:template match=\"/\">        <html>\n		    <body bgcolor=\"#ffffff\">\n               <xsl:if test=\"$someValue\">\n                  <!-- ADD Some Code here -->\n               </xsl:if>\n            </body>\n        </html>\n	</xsl:template>\n</xsl:stylesheet>\n
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/IStyleConstantsXSL.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/IStyleConstantsXSL.java
deleted file mode 100755
index dc222de..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/IStyleConstantsXSL.java
+++ /dev/null
@@ -1,31 +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;
-
-/**
- * Contains the symbolic name of styles used by LineStyleProvider,
- * ColorManager, and any others who may be interested
- */
-public interface IStyleConstantsXSL {
-	public static final String BACKGROUND = "xslbackground"; //$NON-NLS-1$
-	public static final String DECL_BORDER = "xsldeclBoder";//$NON-NLS-1$
-
-	public static final String FOREGROUND = "xslforeground"; //$NON-NLS-1$
-
-	public static final String TAG_ATTRIBUTE_EQUALS = "xsltagAttributeEquals"; //$NON-NLS-1$
-	public static final String TAG_ATTRIBUTE_NAME = "xsltagAttributeName";//$NON-NLS-1$
-	public static final String TAG_ATTRIBUTE_VALUE = "xsltagAttributeValue";//$NON-NLS-1$
-	public static final String TAG_BORDER = "xsltagBorder";//$NON-NLS-1$
-	public static final String TAG_NAME = "xsltagName";//$NON-NLS-1$
-}
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 628c53b..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/LineStyleProviderForXSL.java
+++ /dev/null
@@ -1,455 +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.style;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-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.ITextRegionCollection;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.ui.internal.provisional.style.AbstractLineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.style.Highlighter;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.style.ReconcilerHighlighter;
-import org.eclipse.wst.sse.ui.internal.util.EditorUtility;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
-
-/**
- * This implements a Syntax Line Style Provider for XSL. It leverages some
- * information from the XML Syntax Coloring, but adds specific coloring for XSL
- * specific elements and attributes.
- * 
- * @author David Carver
- * @since 1.0
- * 
- */
-public class LineStyleProviderForXSL extends AbstractLineStyleProvider
-		implements LineStyleProvider {
-
-	protected IStructuredDocument structuredDocument;
-	protected Highlighter highlighter;
-	private boolean initialized;
-	protected PropertyChangeListener preferenceListener = new PropertyChangeListener();
-	protected ReconcilerHighlighter recHighlighter = null;
-
-	private IPreferenceStore xmlPreferenceStore = null;
-
-	protected void commonInit(IStructuredDocument document,
-			Highlighter highlighter) {
-
-		structuredDocument = document;
-		this.highlighter = highlighter;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider#
-	 * prepareRegions(org.eclipse.jface.text.ITypedRegion, int, int,
-	 * java.util.Collection)
-	 */
-	public boolean prepareRegions(ITypedRegion typedRegion,
-			int lineRequestStart, int lineRequestLength, Collection holdResults) {
-		final int partitionStartOffset = typedRegion.getOffset();
-		final int partitionLength = typedRegion.getLength();
-		IStructuredDocumentRegion structuredDocumentRegion = getDocument()
-				.getRegionAtCharacterOffset(partitionStartOffset);
-		boolean handled = false;
-
-		handled = prepareTextRegions(structuredDocumentRegion,
-				partitionStartOffset, partitionLength, holdResults);
-
-		return handled;
-	}
-
-	/**
-	 * @param region
-	 * @param start
-	 * @param length
-	 * @param holdResults
-	 * @return
-	 */
-	protected boolean prepareTextRegion(ITextRegionCollection blockedRegion,
-			int partitionStartOffset, int partitionLength,
-			Collection holdResults) {
-		boolean handled = false;
-		final int partitionEndOffset = partitionStartOffset + partitionLength
-				- 1;
-		ITextRegion region = null;
-		ITextRegionList regions = blockedRegion.getRegions();
-		StyleRange styleRange = null;
-
-		for (int i = 0; i < regions.size(); i++) {
-			region = regions.get(i);
-			TextAttribute attr = null;
-			TextAttribute previousAttr = null;
-			if (blockedRegion.getStartOffset(region) > partitionEndOffset)
-				break;
-			if (blockedRegion.getEndOffset(region) <= partitionStartOffset)
-				continue;
-
-			if (region instanceof ITextRegionCollection) {
-				handled = prepareTextRegion((ITextRegionCollection) region,
-						partitionStartOffset, partitionLength, holdResults);
-			} else {
-
-				attr = getAttributeFor(blockedRegion, region);
-				if (attr != null) {
-					handled = true;
-					styleRange = applyStyleRange(blockedRegion,
-							partitionStartOffset, partitionLength, holdResults,
-							region, styleRange, attr, previousAttr);
-				} else {
-					previousAttr = null;
-				}
-			}
-		}
-		return handled;
-	}
-
-	private StyleRange applyStyleRange(ITextRegionCollection blockedRegion,
-			int partitionStartOffset, int partitionLength,
-			Collection holdResults, ITextRegion region, StyleRange styleRange,
-			TextAttribute attr, TextAttribute previousAttr) {
-		if (equalsPreviousAttribute(styleRange, attr, previousAttr)) {
-			styleRange.length += region.getLength();
-		} else {
-			styleRange = createStyleRange(blockedRegion, region, attr,
-					partitionStartOffset, partitionLength);
-			holdResults.add(styleRange);
-			previousAttr = attr;
-		}
-		return styleRange;
-	}
-
-	private boolean equalsPreviousAttribute(StyleRange styleRange,
-			TextAttribute attr, TextAttribute previousAttr) {
-		return (styleRange != null) && (previousAttr != null)
-				&& (previousAttr.equals(attr));
-	}
-
-	protected boolean prepareTextRegions(
-			IStructuredDocumentRegion structuredDocumentRegion,
-			int partitionStartOffset, int partitionLength,
-			Collection holdResults) {
-		boolean handled = false;
-		final int partitionEndOffset = partitionStartOffset + partitionLength
-				- 1;
-		while (structuredDocumentRegion != null
-				&& structuredDocumentRegion.getStartOffset() <= partitionEndOffset) {
-			ITextRegion region = null;
-			ITextRegionList regions = structuredDocumentRegion.getRegions();
-
-			StyleRange styleRange = null;
-			for (int i = 0; i < regions.size(); i++) {
-				region = regions.get(i);
-				TextAttribute attr = null;
-				TextAttribute previousAttr = null;
-				if (structuredDocumentRegion.getStartOffset(region) > partitionEndOffset)
-					break;
-				if (structuredDocumentRegion.getEndOffset(region) <= partitionStartOffset)
-					continue;
-
-				if (region instanceof ITextRegionCollection) {
-					boolean handledCollection = (prepareTextRegion(
-							(ITextRegionCollection) region,
-							partitionStartOffset, partitionLength, holdResults));
-					handled = (!handled) ? handledCollection : handled;
-				} else {
-					attr = getAttributeFor(structuredDocumentRegion, region);
-					if (attr == null) {
-						previousAttr = null;
-					} else {
-						handled = true;
-						styleRange = applyStyleRange(structuredDocumentRegion,
-								partitionStartOffset, partitionLength,
-								holdResults, region, styleRange, attr,
-								previousAttr);
-					}
-				}
-
-				if (Debug.syntaxHighlighting && !handled) {
-					System.out.println("not handled in prepareRegions"); //$NON-NLS-1$
-				}
-			}
-			structuredDocumentRegion = structuredDocumentRegion.getNext();
-		}
-		return handled;
-	}
-
-	private StyleRange createStyleRange(
-			ITextRegionCollection textRegionCollection, ITextRegion textRegion,
-			TextAttribute attr, int startOffset, int length) {
-		int startingOffset = textRegionCollection.getStartOffset(textRegion);
-		if (startingOffset < startOffset)
-			startingOffset = startOffset;
-
-		int textEnd = startingOffset
-				+ textRegionCollection.getText(textRegion).length();
-		int maxOffset = startOffset + length;
-		int endingOffset = textRegionCollection.getEndOffset(textRegion);
-
-		if (textEnd < endingOffset)
-			endingOffset = textEnd;
-		if (endingOffset > maxOffset)
-			endingOffset = maxOffset;
-		StyleRange result = new StyleRange(startingOffset, endingOffset
-				- startingOffset, attr.getForeground(), attr.getBackground(),
-				attr.getStyle());
-		if ((attr.getStyle() & TextAttribute.STRIKETHROUGH) != 0) {
-			result.strikeout = true;
-		}
-		if ((attr.getStyle() & TextAttribute.UNDERLINE) != 0) {
-			result.underline = true;
-		}
-		return result;
-
-	}
-
-	protected TextAttribute getAttributeFor(ITextRegionCollection collection,
-			ITextRegion textRegion) {
-		if (textRegion == null) {
-			return (TextAttribute) XMLTextAttributeMap.getInstance()
-					.getTextAttributeMap().get(IStyleConstantsXML.CDATA_TEXT);
-		}
-
-		String type = textRegion.getType();
-		if (collection.getText().contains("xsl:")) {
-			return getXSLAttribute(type);
-		}
-
-		return getXMLAttribute(type);
-	}
-
-	private TextAttribute getXSLAttribute(String type) {
-		Map<String, String> regionMap = XSLRegionMap.getInstance()
-				.getRegionMap();
-		Map<String, TextAttribute> textAttributes = XSLTextAttributeMap
-				.getInstance().getTextAttributeMap();
-		return getTextAttribute(type, regionMap, textAttributes);
-	}
-
-	private TextAttribute getXMLAttribute(String type) {
-		Map<String, String> regionMap = XMLRegionMap.getInstance()
-				.getRegionMap();
-		Map<String, TextAttribute> textAttributes = XMLTextAttributeMap
-				.getInstance().getTextAttributeMap();
-
-		return getTextAttribute(type, regionMap, textAttributes);
-	}
-
-	private TextAttribute getTextAttribute(String type,
-			Map<String, String> regionMap,
-			Map<String, TextAttribute> textAttrMap) {
-		return textAttrMap.get(regionMap.get(type));
-	}
-
-	protected void handlePropertyChange(PropertyChangeEvent event) {
-		String styleKey = null;
-		if (event == null)
-			return;
-
-		String prefKey = event.getProperty();
-		// check if preference changed is a style preference
-		if (IStyleConstantsXSL.TAG_NAME.equals(prefKey)) {
-			styleKey = IStyleConstantsXSL.TAG_NAME;
-		}
-		if (IStyleConstantsXSL.TAG_BORDER.equals(prefKey)) {
-			styleKey = IStyleConstantsXSL.TAG_BORDER;
-		}
-		if (IStyleConstantsXSL.TAG_ATTRIBUTE_NAME.equals(prefKey)) {
-			styleKey = IStyleConstantsXSL.TAG_ATTRIBUTE_NAME;
-		}
-		if (IStyleConstantsXSL.TAG_ATTRIBUTE_VALUE.equals(prefKey)) {
-			styleKey = IStyleConstantsXSL.TAG_ATTRIBUTE_VALUE;
-		}
-		if (styleKey == null)
-			return;
-
-		// addXSLTextAttribute(styleKey);
-	}
-
-	private class PropertyChangeListener implements IPropertyChangeListener {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org
-		 * .eclipse.jface.util.PropertyChangeEvent)
-		 */
-		public void propertyChange(PropertyChangeEvent event) {
-			// have to do it this way so others can override the method
-			handlePropertyChange(event);
-		}
-	}
-
-	protected IPreferenceStore getXMLColorPreferences() {
-		if (xmlPreferenceStore == null) {
-			xmlPreferenceStore = XMLUIPlugin.getDefault().getPreferenceStore();
-		}
-		return xmlPreferenceStore;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider#init
-	 * (org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument,
-	 * org.eclipse.wst.sse.ui.internal.provisional.style.Highlighter)
-	 */
-	public void init(IStructuredDocument document, Highlighter highlighter) {
-		commonInit(structuredDocument, highlighter);
-
-		if (isInitialized())
-			return;
-
-		registerPreferenceManager();
-
-		setInitialized(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.wst.sse.ui.internal.provisional.style.AbstractLineStyleProvider
-	 * #
-	 * init(org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument
-	 * , org.eclipse.jface.text.source.ISourceViewer)
-	 */
-	public void init(IStructuredDocument structuredDocument,
-			ISourceViewer sourceViewer) {
-		init(structuredDocument, (Highlighter) null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.wst.sse.ui.internal.provisional.style.AbstractLineStyleProvider
-	 * #
-	 * init(org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument
-	 * ,
-	 * org.eclipse.wst.sse.ui.internal.provisional.style.ReconcilerHighlighter)
-	 */
-	public void init(IStructuredDocument structuredDocument,
-			ReconcilerHighlighter highlighter) {
-		this.structuredDocument = structuredDocument;
-		recHighlighter = highlighter;
-
-		if (isInitialized())
-			return;
-
-		registerPreferenceManager();
-
-		setInitialized(true);
-	}
-
-	public void release() {
-		unRegisterPreferenceManager();
-		setInitialized(false);
-	}
-
-	@Override
-	protected void unRegisterPreferenceManager() {
-		// TODO: Implement listening for Preference Changes.
-	}
-
-	@Override
-	protected void registerPreferenceManager() {
-		// TODO: Implement listen for Preference Changes...does this belong
-		// here, or elsewhere?
-	}
-
-	/**
-	 * Returns the initialized.
-	 * 
-	 * @return boolean
-	 */
-	public boolean isInitialized() {
-		return initialized;
-	}
-
-	/**
-	 * Sets the initialized.
-	 * 
-	 * @param initialized
-	 *            The initialized to set
-	 */
-	private void setInitialized(boolean initialized) {
-		this.initialized = initialized;
-	}
-
-	protected IStructuredDocument getDocument() {
-		return structuredDocument;
-	}
-
-	/**
-	 * This is now part of the TextAttributeMap classes, left here to override
-	 * AbstractStyleClasses
-	 */
-	@Deprecated
-	@Override
-	protected TextAttribute createTextAttribute(RGB foreground, RGB background,
-			boolean bold) {
-		return null;
-	}
-
-	/**
-	 * This is now part of the TextAttributeMap classes, left here to override
-	 * AbstractStyleClasses
-	 */
-	@Deprecated
-	@Override
-	protected TextAttribute createTextAttribute(RGB foreground, RGB background,
-			int style) {
-		return new TextAttribute((foreground != null) ? EditorUtility
-				.getColor(foreground) : null,
-				(background != null) ? EditorUtility.getColor(background)
-						: null, style);
-	}
-
-	@Override
-	@Deprecated
-	protected TextAttribute getAttributeFor(ITextRegion region) {
-		return null;
-	}
-
-	@Override
-	@Deprecated
-	protected IPreferenceStore getColorPreferences() {
-		return null;
-	}
-
-	@Override
-	@Deprecated
-	protected void loadColors() {
-
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XMLRegionMap.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XMLRegionMap.java
deleted file mode 100644
index 13b494e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XMLRegionMap.java
+++ /dev/null
@@ -1,81 +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.style;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
-
-/**
- * The XMLRegionMap class handles mapping duties from an XML Region to
- * a Line Style Constant.
- * 
- * @author David Carver
- * @since 1.0
- */
-public class XMLRegionMap {
-	
-	private static HashMap<String,String> regionMap = new HashMap<String,String>();
-	private static XMLRegionMap xmlRegionMap = new XMLRegionMap(); 
-	
-	private XMLRegionMap() {
-		
-		regionMap.put(DOMRegionContext.XML_CONTENT, IStyleConstantsXML.XML_CONTENT);
-		regionMap.put(DOMRegionContext.XML_DOCTYPE_INTERNAL_SUBSET, IStyleConstantsXML.XML_CONTENT);
-		regionMap.put(DOMRegionContext.XML_TAG_OPEN, IStyleConstantsXML.TAG_BORDER);
-		regionMap.put(DOMRegionContext.XML_TAG_CLOSE, IStyleConstantsXML.TAG_BORDER);
-		regionMap.put(DOMRegionContext.XML_END_TAG_OPEN, IStyleConstantsXML.TAG_BORDER);
-		regionMap.put(DOMRegionContext.XML_CDATA_OPEN, IStyleConstantsXML.CDATA_BORDER);
-		regionMap.put(DOMRegionContext.XML_CDATA_CLOSE, IStyleConstantsXML.CDATA_BORDER);
-		regionMap.put(DOMRegionContext.XML_CDATA_TEXT, IStyleConstantsXML.CDATA_TEXT);
-		regionMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, IStyleConstantsXML.TAG_ATTRIBUTE_NAME);
-		regionMap.put(DOMRegionContext.XML_DOCTYPE_DECLARATION, IStyleConstantsXML.TAG_NAME);
-		regionMap.put(DOMRegionContext.XML_TAG_NAME, IStyleConstantsXML.TAG_NAME);
-		regionMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, IStyleConstantsXML.TAG_ATTRIBUTE_VALUE);
-		regionMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS);
-		regionMap.put(DOMRegionContext.XML_COMMENT_OPEN, IStyleConstantsXML.COMMENT_BORDER);
-		regionMap.put(DOMRegionContext.XML_COMMENT_CLOSE, IStyleConstantsXML.COMMENT_BORDER);
-		regionMap.put(DOMRegionContext.XML_COMMENT_TEXT, IStyleConstantsXML.COMMENT_TEXT);
-		regionMap.put(DOMRegionContext.XML_DOCTYPE_NAME, IStyleConstantsXML.DOCTYPE_NAME);
-		regionMap.put(DOMRegionContext.XML_CHAR_REFERENCE, IStyleConstantsXML.ENTITY_REFERENCE);
-		regionMap.put(DOMRegionContext.XML_PE_REFERENCE, IStyleConstantsXML.ENTITY_REFERENCE);
-		regionMap.put(DOMRegionContext.XML_PI_CONTENT, IStyleConstantsXML.PI_CONTENT);
-		regionMap.put(DOMRegionContext.XML_PI_OPEN, IStyleConstantsXML.PI_BORDER);
-		regionMap.put(DOMRegionContext.XML_PI_CLOSE, IStyleConstantsXML.PI_BORDER);
-		regionMap.put(DOMRegionContext.XML_DECLARATION_OPEN, IStyleConstantsXML.DECL_BORDER);
-		regionMap.put(DOMRegionContext.XML_DECLARATION_CLOSE, IStyleConstantsXML.DECL_BORDER);
-		regionMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF);
-		regionMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF);
-		regionMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBLIC, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID);
-		regionMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSTEM, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID);
-		regionMap.put(DOMRegionContext.UNDEFINED, IStyleConstantsXML.CDATA_TEXT);
-		regionMap.put(DOMRegionContext.WHITE_SPACE, IStyleConstantsXML.XML_CONTENT);
-	}
-	
-	/**
-	 * Returns an instance of the XMLRegionMap Class
-	 * @return
-	 */
-	public static XMLRegionMap getInstance() {
-		  return xmlRegionMap;
-	}
-	
-	/**
-	 * Returns a mapping of XML Regions to Style Constants
-	 * @return
-	 */
-	public Map<String,String> getRegionMap() {
-		return regionMap;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XMLTextAttributeMap.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XMLTextAttributeMap.java
deleted file mode 100644
index c0f5502..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XMLTextAttributeMap.java
+++ /dev/null
@@ -1,113 +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 213775 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.style;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-import org.eclipse.wst.sse.ui.internal.util.EditorUtility;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
-
-/**
- * XMlTextAttributeMap handles the mapping of XML Style Constants to TextAttributes.
- * 
- * @author David Carver
- * @since 1.0
- */
-public class XMLTextAttributeMap {
-	
-	private static HashMap<String,TextAttribute> textAttributeMap = new HashMap<String,TextAttribute>();
-	private static XMLTextAttributeMap xmlTextAttributeMap = new XMLTextAttributeMap(); 
-	private static IPreferenceStore xmlPreferenceStore;
-	
-	private static IPreferenceStore getXslPreferenceStore() {
-		return xmlPreferenceStore;
-	}
-	private XMLTextAttributeMap() {
-		xmlPreferenceStore = XMLUIPlugin.getDefault().getPreferenceStore();
-		addXMLTextAttribute(IStyleConstantsXML.TAG_NAME);
-		addXMLTextAttribute(IStyleConstantsXML.TAG_BORDER);
-		addXMLTextAttribute(IStyleConstantsXML.TAG_ATTRIBUTE_NAME);
-		addXMLTextAttribute(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE);
-		addXMLTextAttribute(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS);
-		addXMLTextAttribute(IStyleConstantsXML.COMMENT_BORDER);
-		addXMLTextAttribute(IStyleConstantsXML.COMMENT_TEXT);
-		addXMLTextAttribute(IStyleConstantsXML.CDATA_BORDER);
-		addXMLTextAttribute(IStyleConstantsXML.CDATA_TEXT);
-		addXMLTextAttribute(IStyleConstantsXML.DECL_BORDER);
-		addXMLTextAttribute(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID);
-		addXMLTextAttribute(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF);
-		addXMLTextAttribute(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF);
-		addXMLTextAttribute(IStyleConstantsXML.DOCTYPE_NAME);
-		addXMLTextAttribute(IStyleConstantsXML.PI_CONTENT);
-		addXMLTextAttribute(IStyleConstantsXML.PI_BORDER);
-		addXMLTextAttribute(IStyleConstantsXML.XML_CONTENT);
-		addXMLTextAttribute(IStyleConstantsXML.ENTITY_REFERENCE);
-	}
-	
-	/**
-	 * An instance of XMLTextAttributeMap.
-	 * @return
-	 */
-	public static XMLTextAttributeMap getInstance() {
-		  return xmlTextAttributeMap;
-	}
-	
-	/**
-	 * Returns a Map of Style Constants and the corresponding Text Attribute
-	 * @return
-	 */
-	public Map<String,TextAttribute> getTextAttributeMap() {
-		return textAttributeMap;
-	}
-	
-	private void addXMLTextAttribute(String colorKey) {
-		if (getXslPreferenceStore() != null) {
-			String prefString = getXslPreferenceStore().getString(colorKey);
-			String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-			if (stylePrefs != null) {
-				RGB foreground = ColorHelper.toRGB(stylePrefs[0]);
-				RGB background = ColorHelper.toRGB(stylePrefs[1]);
-				boolean bold = Boolean.valueOf(stylePrefs[2]).booleanValue();
-				boolean italic = Boolean.valueOf(stylePrefs[3]).booleanValue();
-				boolean strikethrough = Boolean.valueOf(stylePrefs[4]).booleanValue();
-				boolean underline = Boolean.valueOf(stylePrefs[5]).booleanValue();
-				int style = SWT.NORMAL;
-				if (bold) {
-					style = style | SWT.BOLD;
-				}
-				if (italic) {
-					style = style | SWT.ITALIC;
-				}
-				if (strikethrough) {
-					style = style | TextAttribute.STRIKETHROUGH;
-				}
-				if (underline) {
-					style = style | TextAttribute.UNDERLINE;
-				}
-
-				TextAttribute createTextAttribute = createTextAttribute(foreground, background, style);
-				textAttributeMap.put(colorKey, createTextAttribute);
-			}
-		}
-	}
-
-	protected TextAttribute createTextAttribute(RGB foreground, RGB background, int style) {
-		return new TextAttribute((foreground != null) ? EditorUtility.getColor(foreground) : null, (background != null) ? EditorUtility.getColor(background) : null, style);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XSLRegionMap.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XSLRegionMap.java
deleted file mode 100644
index abc26a3..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XSLRegionMap.java
+++ /dev/null
@@ -1,56 +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 213775 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.style;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-/**
- * XSLRegionMap handles the mapping of XML Regions to XSL Style Constants.
- * 
- * @author David Carver
- * @since 1.0
- */
-public class XSLRegionMap {
-	
-	private static HashMap<String,String> regionMap = new HashMap<String,String>();
-	private static XSLRegionMap xslRegionMap = new XSLRegionMap(); 
-	
-	private XSLRegionMap() {
-		regionMap.put(DOMRegionContext.XML_TAG_OPEN, IStyleConstantsXSL.TAG_BORDER);
-		regionMap.put(DOMRegionContext.XML_END_TAG_OPEN, IStyleConstantsXSL.TAG_BORDER);
-		regionMap.put(DOMRegionContext.XML_TAG_CLOSE, IStyleConstantsXSL.TAG_BORDER);
-		regionMap.put(DOMRegionContext.XML_EMPTY_TAG_CLOSE, IStyleConstantsXSL.TAG_BORDER);
-		regionMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, IStyleConstantsXSL.TAG_ATTRIBUTE_NAME);
-		regionMap.put(DOMRegionContext.XML_TAG_NAME, IStyleConstantsXSL.TAG_NAME);
-		regionMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, IStyleConstantsXSL.TAG_ATTRIBUTE_VALUE);
-	
-	}
-	
-	/**
-	 * Returns an instance of XSLRegionMap.
-	 * @return
-	 */
-	public static XSLRegionMap getInstance() {
-		  return xslRegionMap;
-	}
-	
-	/**
-	 * Returns a MAP of XSL Regions and Style Constants.
-	 * @return
-	 */
-	public Map<String,String> getRegionMap() {
-		return regionMap;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XSLTextAttributeMap.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XSLTextAttributeMap.java
deleted file mode 100644
index e827407..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/XSLTextAttributeMap.java
+++ /dev/null
@@ -1,98 +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 213775 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.style;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-import org.eclipse.wst.sse.ui.internal.util.EditorUtility;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-/**
- * Handles the mapping of the Style Constants to Text Attributes for XSL.
- * 
- * @author David Carver
- * @since 1.0
- */
-public class XSLTextAttributeMap {
-	
-	private static HashMap<String,TextAttribute> textAttributeMap = new HashMap<String,TextAttribute>();
-	private static XSLTextAttributeMap xslTextAttributeMap = new XSLTextAttributeMap(); 
-	private static IPreferenceStore xslPreferenceStore;
-	
-	private static IPreferenceStore getXslPreferenceStore() {
-		return xslPreferenceStore;
-	}
-	private XSLTextAttributeMap() {
-		xslPreferenceStore = XSLUIPlugin.getDefault().getPreferenceStore();
-		addXSLTextAttribute(IStyleConstantsXSL.TAG_NAME);
-		addXSLTextAttribute(IStyleConstantsXSL.TAG_BORDER);
-		addXSLTextAttribute(IStyleConstantsXSL.TAG_ATTRIBUTE_NAME);
-		addXSLTextAttribute(IStyleConstantsXSL.TAG_ATTRIBUTE_VALUE);
-	}
-	
-	/**
-	 * Returns an instance of XSLTextAttributeMap
-	 * @return
-	 */
-	public static XSLTextAttributeMap getInstance() {
-		  return xslTextAttributeMap;
-	}
-	
-	/**
-	 * Get's a Map of XSL Style Constants to Text Attributes.
-	 * @return
-	 */
-	public Map<String,TextAttribute> getTextAttributeMap() {
-		return textAttributeMap;
-	}
-	
-	protected void addXSLTextAttribute(String colorKey) {
-		if (getXslPreferenceStore() != null) {
-			String prefString = getXslPreferenceStore().getString(colorKey);
-			String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-			if (stylePrefs != null) {
-				RGB foreground = ColorHelper.toRGB(stylePrefs[0]);
-				RGB background = ColorHelper.toRGB(stylePrefs[1]);
-				boolean bold = Boolean.valueOf(stylePrefs[2]).booleanValue();
-				boolean italic = Boolean.valueOf(stylePrefs[3]).booleanValue();
-				boolean strikethrough = Boolean.valueOf(stylePrefs[4]).booleanValue();
-				boolean underline = Boolean.valueOf(stylePrefs[5]).booleanValue();
-				int style = SWT.NORMAL;
-				if (bold) {
-					style = style | SWT.BOLD;
-				}
-				if (italic) {
-					style = style | SWT.ITALIC;
-				}
-				if (strikethrough) {
-					style = style | TextAttribute.STRIKETHROUGH;
-				}
-				if (underline) {
-					style = style | TextAttribute.UNDERLINE;
-				}
-
-				TextAttribute createTextAttribute = createTextAttribute(foreground, background, style);
-				textAttributeMap.put(colorKey, createTextAttribute);
-			}
-		}
-	}
-
-	protected TextAttribute createTextAttribute(RGB foreground, RGB background, int style) {
-		return new TextAttribute((foreground != null) ? EditorUtility.getColor(foreground) : null, (background != null) ? EditorUtility.getColor(background) : null, style);
-	}
-
-}
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 c0d068a..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/util/XSLPluginImages.java
+++ /dev/null
@@ -1,59 +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$
-	
-	/**
-	 * Path to the XML Prefix Image used for Content Assist
-	 */
-	public static final String IMG_PREFIX = "icons/full/package_obj.gif"; //$NON-NLS-1$
-	
-	/**
-	 * Path to the XSL mode Image used for Content Assist
-	 */
-	public static final String IMG_MODE = "icons/full/mode.gif"; //$NON-NLS-1$
-	
-	/**
-	 * Path to the XSL File image use for Content Assistance.
-	 */
-	public static final String IMG_XSL_FILE = "icons/full/xslt_file.gif"; //$NON-NLS-1$ 
-
-	/**
-	 * Path to the xsl template image use for Content Assistance.
-	 */
-	public static final String IMG_TEMPLATE = "icons/full/template.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 83cf76f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXSL.java
+++ /dev/null
@@ -1,92 +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.core.resources.IFile;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-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;
-import org.eclipse.wst.xsl.ui.internal.editor.XSLEditor;
-
-/**
- * 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()
-	{
-	}
-
-	@Override
-	public void validate(IValidationContext helper, IReporter reporter) throws ValidationException
-	{
-		super.validate(helper, reporter);
-		// validating will refresh the model, so now calculate the overrides.
-		// (we only calculate overrides for source validation as we only want to do it for files open in an editor)
-		// There follows a very complicated way of creating the required annotations in an editor...
-		String[] delta = helper.getURIs();
-		if (delta.length > 0)
-		{
-			IFile file = getFile(delta[0]);
-			// find any files with open editors...
-			IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
-			for (IWorkbenchWindow workbenchWindow : windows)
-			{
-				IWorkbenchPage page = workbenchWindow.getActivePage();
-				if (page != null)
-				{
-					IEditorReference[] refs = page.findEditors(new FileEditorInput(file), "org.eclipse.wst.xsl.ui.XSLEditor", IWorkbenchPage.MATCH_ID | IWorkbenchPage.MATCH_INPUT);
-					// lets hope we only have one XSL editor open on the file, or else we don't know which one started this validation...
-					if (refs.length == 1)
-					{
-						XSLEditor editor = (XSLEditor) refs[0].getEditor(false);
-						if (editor != null)
-						{// all this work just to get here...
-							editor.getOverrideIndicatorManager().updateAnnotations();
-						}
-					}
-				}
-			}
-		}
-	}
-
-	private Validator getValidator()
-	{
-		if (_validator == null)
-			_validator = ValidationFramework.getDefault().getValidator(Id, null);
-		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 1d4d328..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileTemplatesWizardPage.java
+++ /dev/null
@@ -1,451 +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.resource.JFaceResources;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.ISourceViewer;
-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.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xsl.ui.internal.StructuredTextViewerConfigurationXSL;
-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)
-	{
-		SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
-			StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationXSL();
-
-			public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-				return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-			}
-
-			public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-				return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
-			}
-		};
-		SourceViewer viewer = new StructuredTextViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		((StructuredTextViewer) viewer).getTextWidget().setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
-		IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		IDocument document = scratchModel.getStructuredDocument();
-		viewer.configure(sourceViewerConfiguration);
-		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(XSLUIConstants.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(XSLUIConstants.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/xslfiles/syntaxcoloring.xsl b/bundles/org.eclipse.wst.xsl.ui/xslfiles/syntaxcoloring.xsl
deleted file mode 100644
index 85c8b58..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/xslfiles/syntaxcoloring.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:variable name="somveValue">1234</xsl:variable>
-	<xsl:template match="/">
-         <xsl:if test="$someValue">
-            <xsl:apply-templates />
-         </xsl:if>
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl/.project b/bundles/org.eclipse.wst.xsl/.project
deleted file mode 100644
index 525a3cd..0000000
--- a/bundles/org.eclipse.wst.xsl/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.xsl/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl/META-INF/MANIFEST.MF
deleted file mode 100644
index 5ab4ae4..0000000
--- a/bundles/org.eclipse.wst.xsl/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsl
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.wst.xsl/about.html b/bundles/org.eclipse.wst.xsl/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.xsl/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, 2008</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/about.ini b/bundles/org.eclipse.wst.xsl/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/bundles/org.eclipse.wst.xsl/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/bundles/org.eclipse.wst.xsl/about.mappings b/bundles/org.eclipse.wst.xsl/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/bundles/org.eclipse.wst.xsl/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/bundles/org.eclipse.wst.xsl/about.properties b/bundles/org.eclipse.wst.xsl/about.properties
deleted file mode 100644
index e460f94..0000000
--- a/bundles/org.eclipse.wst.xsl/about.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=WTP XSL Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright\n\
-  Doug Satchwell (Chase Technology Ltd),\n\
-  David Carver (Standards for Technology in Automotive Retail)\n\
-  and others 2008. All rights reserved.\n\
-\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/bundles/org.eclipse.wst.xsl/build.properties b/bundles/org.eclipse.wst.xsl/build.properties
deleted file mode 100644
index e4aae79..0000000
--- a/bundles/org.eclipse.wst.xsl/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = META-INF/,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               plugin.properties,\
-               wtp_prod32.gif,\
-               wtp_prod32.png
diff --git a/bundles/org.eclipse.wst.xsl/plugin.properties b/bundles/org.eclipse.wst.xsl/plugin.properties
deleted file mode 100644
index 4ea43ba..0000000
--- a/bundles/org.eclipse.wst.xsl/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.wst.xsl
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = WTP XSL Tools (Incubating)
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl/wtp_prod32.gif b/bundles/org.eclipse.wst.xsl/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/bundles/org.eclipse.wst.xsl/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl/wtp_prod32.png b/bundles/org.eclipse.wst.xsl/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/bundles/org.eclipse.wst.xsl/wtp_prod32.png
+++ /dev/null
Binary files differ
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 f266912..0000000
--- a/docs/org.eclipse.wst.xsl.doc/.project
+++ /dev/null
@@ -1,27 +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.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
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/.settings/org.eclipse.wst.validation.prefs b/docs/org.eclipse.wst.xsl.doc/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index a9a9a29..0000000
--- a/docs/org.eclipse.wst.xsl.doc/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sat Sep 20 17:03:09 GMT 2008
-DELEGATES_PREFERENCE=delegateValidatorList
-USER_BUILD_PREFERENCE=enabledBuildValidatorList
-USER_MANUAL_PREFERENCE=enabledManualValidatorList
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.0.v200807211450
-eclipse.preferences.version=1
-override=true
-suspend=false
-vals/org.eclipse.jst.jsp.core.JSPBatchValidator/global=FF01
-vals/org.eclipse.jst.jsp.core.JSPContentValidator/global=FF01
-vals/org.eclipse.wst.html.ui.HTMLValidator/global=FF01
-vals/org.eclipse.wst.wsdl.validation.wsdl/global=FF02158org.eclipse.wst.wsdl.validation.internal.eclipse.Validator
-vals/org.eclipse.wst.xml.core.xml/groups=0107include07111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF07fileext03gphF07fileext115wdo-connectionsF0107exclude06113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature113projectNature130org.eclipse.jst.j2ee.EARNature04file08.projectT0104file110.classpathT0104file110.settings/T0204file112concepts.xmlF01
-vals/org.eclipse.wst.xsd.core.xsd/global=FF02162org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator
-vf.version=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 863cea2..0000000
--- a/docs/org.eclipse.wst.xsl.doc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xsl.doc;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-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-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Vendor: %vendorName
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.xsl.doc/about.html b/docs/org.eclipse.wst.xsl.doc/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.xsl.doc/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, 2008</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/docs/org.eclipse.wst.xsl.doc/build.properties b/docs/org.eclipse.wst.xsl.doc/build.properties
deleted file mode 100644
index 6cd5053..0000000
--- a/docs/org.eclipse.wst.xsl.doc/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               html/,\
-               *.xml,\
-               about.html,\
-               plugin.properties
-generateSourceBundle=false
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 3efa4b0..0000000
--- a/docs/org.eclipse.wst.xsl.doc/build.xml
+++ /dev/null
@@ -1,41 +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
-chapter   toc,title
-section   title" />
-			<param name="chapter.autolabel" expression="0"/>
-			<param name="section.autolabel" expression="0"/>
-			<param name="html.stylesheet" expression="book.css ../book.css"/>
-		</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/concepts/RescuingXSLTfromNicheStatus.xml b/docs/org.eclipse.wst.xsl.doc/docbook/concepts/RescuingXSLTfromNicheStatus.xml
deleted file mode 100644
index 6e19a82..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/concepts/RescuingXSLTfromNicheStatus.xml
+++ /dev/null
@@ -1,502 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<section id="ResucingXSLT">
-   <title>Rescuing XSLT From Niche Status</title>
-   <subtitle>A Gentle Introduction to XSLT through HTML Templates</subtitle>
-   <note>
-      <para>
-         <emphasis>
-            Editors Note: This originally appeared at
-            <ulink url="http://www.xfront.com/rescuing-xslt.html">XFront.com</ulink>
-            , and is republished here with permission. The article is written by David Jacobs.
-         </emphasis>
-      </para>
-   </note>
-   <abstract>
-      <para>
-         XSLT is one of the most exciting technologies to come out of the XML family. Unfortunately, its incredible
-         power and associated complexity can be overwhelming to new users preventing many from experimenting with it or
-         causing them to quickly give up in disgust. In fact, unless the method of teaching and the common style of use
-         for XSLT is radically changed to make it more accessible, XSLT will be relegated to niche status like SGML and
-         other powerful technologies.
-      </para>
-   </abstract>
-   <section>
-      <title>The Problem</title>
-      <para>
-         The 1990’s saw an incredible proliferation of new web related languages. Looking back we can see what
-         features separated the winners and losers. The biggest key has been having a very low barrier to entry. Many
-         languages accomplished this by following the following rules.
-      </para>
-      <itemizedlist>
-         <listitem>
-            <para>
-               Leverage as much existing knowledge as possible.
-            </para>
-         </listitem>
-         <listitem>
-            <para>
-               Make it easy to get started with "hello world" style example.
-            </para>
-         </listitem>
-         <listitem>
-            <para>
-               The most common and useful language constructs should be easily conveyed with a few small examples.
-            </para>
-         </listitem>
-         <listitem>
-            <para>
-               Complex programming constructs should only be required when what is trying to be accomplished is
-               complex.            
-            </para>
-         </listitem>
-      </itemizedlist>
-      <para>
-         From these rules we can see why embedded web scripting languages like Active Server Pages (ASPs), Cold
-         Fusion, PHP and
-         Java Server Pages (JSPs) are so popular. They all leverage a user’s knowledge of HTML. They also
-         allow the
-         minimum amount of scripting to be added to accomplish the dynamic feature a developer is looking for.
-         This has
-         allowed numerous web developers to start off with very small projects and then through continuos
-         enhancement
-         and learning, find themselves using the full power of a complex programming language. Furthermore,
-         because of
-         the very incremental nature of that learning the developer was never scared off.         
-      </para>
-      <para>
-         HTML has also fostered the technique of learning by example. When a web author sees another site with a
-         feature they
-         like, they immediately bring up the source to see how it was implemented. In this way many web
-         authors were
-         able to learn complex HTML tricks with no formal training. While server-side scripts are not as
-         easy to come
-         by, there are still numerous sites that house thousands of example scripts for a blossoming
-         developer to
-         examine.         
-      </para>
-      <para>
-         Traditionally XSLT has been presented as a programming language for translating XML documents into another
-         format, often for presentation. This frames the problem, such that for each element, the programmer has the
-         task of figuring out how that element needs to be translated. As long as there are one to one mappings or one
-         to zero mappings this is straightforward. For example, if every occurrence of a <![CDATA[
-         <name>]]>
-         element is going to
-         become an HTML header. It is a simple matter to write a matching template to accomplish
-         this.
-      </para>
-      <programlisting id="pl_NameTemplate">
-<![CDATA[
-<xsl:template match="name">
-  <h1><xsl:apply-templates/></h1>
-</xsl:template>
-]]>      
-      </programlisting>
-      <para>
-         However when adding one to many mappings (i.e. when an element’s contents will appear multiple times in the
-         target document with different formatting), keeping track of all the relationships quickly grows in complexity
-         and becomes confusing. For example, if, after writing the previous template, the programmer discovers that the
-         name also needs to be placed in the title the programmer might add the template
-      </para>
-      <programlisting id="pl_valueOf">
-<![CDATA[
-<xsl:template match="/">
-  <title><xsl:value-of select="name"/></title>
-</xsl:template>
-]]>      
-      </programlisting>
-      <para>
-         Notice the use of the <![CDATA[<xsl:value-of>]]>
-         function in this template because using <![CDATA[<apply-templates select="name">]]>
-         would have caused a triggering of the previous template adding undesired header tags to my content. This means
-         before adding a translation to an element the programmer must first be aware of all the existing translations
-         (ugh!). Of course if the programmer became aware of the
-         <![CDATA[<title>]]>
-         requirement first, the contents of these templates could have been reversed. One can quickly see how
-         the
-         arbitrary decisions of development and discovery of requirements can lead to a set of templates that are
-         no
-         longer intuitive.
-      </para>
-      <para>
-         As a programmer with more than 20 years experience with over a dozen languages, XSLT templates and default
-         rules were
-         not obvious to me. Over the past year or two I had looked at numerous examples trying to discern how
-         they
-         worked. While I could understand the general gist of what was occurring, there was too much implied
-         behavior
-         that I did not pick up. It was not until going through formal XSLT training that I fully understood how
-         XSLT
-         worked. Clearly, if the barrier to entry is that high for an experienced programmer, the average web
-         developer
-         was not going to find this technology very useful.          
-      </para>
-   </section>
-   <section>
-      <title>The Solution</title>
-      <para>
-         So how do we solve this problem and help deliver XSLT’s promise to the masses? For XSLT to be successful it
-         must be
-         presented and used in a way that adopts those attributes discussed earlier (reuse of knowledge, fast
-         start, and
-         gradualism). This tutorial will attempt to ease XSLT’s introduction by focusing on these attributes.
-         First, it
-         is only going to focus on the generation of HTML documents and users who are familiar with HTML. If
-         your goal
-         is to immediately start transforming one XML document into another XML document this tutorial is not
-         for you.
-      </para>
-      <para>
-         The second is to reframe the problem so the XSLT solutions programmers write are more naturally extensible
-         and
-         intuitive. Instead of trying to translate an XML source document into an HTML presentation document, the
-         programmer should see the XML document as a complex data structure with XSLT providing powerful tools for
-         extracting that information into their HTML documents. This allows us to leverage the experience most people
-         have with using an HTML templating language (e.g. ASP, PHP, JSP, Cold Fusion, Web Macro, etc). These templating
-         languages are all based on the basic premise that HTML comes first and all enhancements are then embedded in
-         special tags.         
-      </para>
-      <para>
-         With some caveats, this tutorial will show how XSLT can be used in this same way. The benefit of this
-         approach is it
-         allows the quick use of many of XSLT’s powerful functions while letting you learn its more
-         esoteric
-         capabilities as the need arises. In addition the resulting XSLT files are more intuitive and
-         maintainable.
-      </para>
-      <programlisting>
-<emphasis role="bold"><![CDATA[<xsl:value-of> and {}]]></emphasis>         
-      </programlisting>
-      <para>
-         On to an example. Here is a very simple welcome page.         
-      </para>
-      <programlisting>
-<![CDATA[
-<html>
-  <head>
-    <title>Welcome</title>
-  </head>
-  <body>
-    Welcome!
-  </body>
-</html>
-]]>         
-      </programlisting>
-      <para>
-         And here is an XML document with information on member.      
-      </para>
-      <programlisting>
-<![CDATA[
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:template match="/">
-    <html>
-      <head>
-        <title>Welcome</title>
-      </head>
-      <body>
-        Welcome <xsl:value-of select="member/name"/>!
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
-]]>      
-      </programlisting>
-      <para>
-         There are a couple of things that need to be pointed out right away. First this is a well-formed XML
-         document. This mean all HTML used must conform to the XHTML specification (i.e. all tags must be closed and
-         lowercase).
-      </para>
-      <para>
-         The lines before the <![CDATA[<html>]]>
-         tag and after the <![CDATA[</html>]]>
-         tag will be seen in all the examples. For now, other than realizing that they are required in any style sheet
-         created, just go ahead and forget they are there. You don’t NEED to understand them right now to get useful
-         work out of XSLT.
-      </para>
-      <para>
-         Notice the HTML is identical to the original except for the introduction of a new tag
-         <![CDATA[<xsl:value-of>]]>.
-         This tag is the key to extracting any piece of information out an XML document. It has a "select"
-         attribute that
-         provides the path through the XML document to the information we seek. In this case
-            <![CDATA[<member>]]>
-         is the outer most tag and
-         <![CDATA[<name>]]>
-         is the tag underneath it. Slash characters ("/") are used to designate parent/child relationships
-         between tags.
-         If you are used to navigating around a Unix file system this should feel familiar.
-      </para>
-      <para>
-         Now let’s consider further customizing this page by making the welcome in the person’s favorite color using the
-         <![CDATA[<font>]]>
-         tag with the "bgcolor" attribute. Because
-            <![CDATA[<xsl:value-of>]]>
-         is an XML tag it is not valid to insert it in an HTML attribute value. So another mechanism
-         is needed to insert
-         information from our XML file there.
-      </para>
-      <programlisting>
-<![CDATA[
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:template match="/">
-    <html>
-      <head>
-        <title>Welcome</title>
-      </head>
-      <body>
-        <font bgcolor="{member/favoriteColor}">
-          Welcome <xsl:value-of select="member/name"/>!
-        </font>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
-]]>
-      </programlisting>
-      <para>
-         Notice the use of the curly brackets ("{}"). When used within an attribute assignment "{path}" has the exact
-         same effect as
-         <![CDATA[<xsl:value-of select="path" />]]>
-         used outside of attribute assignments.
-      </para>
-   </section>
-   <section>
-      <title>Queries</title>
-      <para>
-         Not all paths lead to a single node. For example, what if we wanted to put a person’s home phone number on the
-         page? Notice that the XML document contains two phone entries. If we simply used
-         <![CDATA[<xsl:value-of select="member/phone" />]]>
-         both entries would be returned. We obviously need a way to be more specific. Luckily, XSLT allows the full
-         power of XPath to describe the value(s) of interest. XPath allows conditions on any attribute or tag to be
-         placed in square brackets ("[]") which are then used to restrict the values returned.
-      </para>
-      <para>
-         So to retrieve the home phone number we would use the path "member/phone[@type=’home’]". Notice the "@"
-         symbol in front
-         of "type". The "@" symbol signifies that we are referring to an attribute. So our new HTML
-         template looks like:
-      </para>
-      <programlisting>
-<![CDATA[      
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:template match="/">
-    <html>
-      <head>
-        <title>Welcome</title>
-      </head>
-      <body>
-        <font bgcolor="{member/favoriteColor}">
-          Welcome <xsl:value-of select="member/name"/>!
-          <br/>
-          Your home phone number is:
-]]>          <emphasis role="bold"><![CDATA[<xsl:value-of select="member/phone[@type=’home’]"/>]]></emphasis>
-<![CDATA[        </font>
-      </body
-    </html
-  </xsl:template>
-</xsl:stylesheet>
-]]>
-      </programlisting>
-      <section>
-         <title>xsl:for-each</title>
-         <para>
-            The previous example brings up another issue. What if this
-            <![CDATA[<member>]]>
-            entry had numerous phone numbers and we wanted to print them all on the web page. We could simply use
-               <![CDATA[<xsl:value-of select="member/phone" />]]>
-            but this would not enable us to format the phone number into a nice list that describes the type of each
-            number.
-         </para>
-         <para>
-            To accomplish this requires the introduction of the
-            <![CDATA[<xsl:for-each>]]>
-            tag which allows us to loop through each of the elements that match a given path. So to
-            create a table that
-            contains the phone number type in the first column and the phone number in the second
-            column, the following
-            stylesheet could be used.
-         </para>
-         <programlisting>
-<![CDATA[
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:template match="/">
-    <html>
-      <head>
-        <title>Welcome</title>
-      </head>
-      <body>
-        <font bgcolor="{member/favoriteColor}">
-          Welcome <xsl:value-of select="member/name"/>!
-        </font>
-        <table>
-          <tr><th>Type</th><th>Number</th></tr>
-          <xsl:for-each select="member/phone">
-            <tr>
-              <td><xsl:value-of select="@type"/></td>
-              <td><xsl:value-of select="."/></td>
-            </tr>
-          </xsl:for-each>
-        </table>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
-]]>         
-         </programlisting>
-         <para>
-            This example brings up a number of issues. First, while in the loop, all
-            <![CDATA[<xsl:value-of />]]>
-            accesses are relative to the current element being iterated over (in this case
-            <![CDATA[<phone>)]]>.
-            Notice the use of the period ("."), which like in a Unix file system means the current element.
-            So in this
-            case the period (".") refers to each phone element as the loop iterates. Also like in a file
-            system you can
-            address a parent element using a double period ("..") and can access any element in the
-            document by starting
-            over at the root element using a slash ("/").
-         </para>
-      </section>
-      <section>
-         <title>xsl:if</title>
-         <para>
-            As a last enhancement to our page let’s add a special offer to "platinum" level members. To do this requires
-            the use of a new tag
-            <![CDATA[<xsl:if>]]>
-            which allows us to insert content based on a condition of the data in the XML document.
-         </para>
-         <programlisting>
-<![CDATA[
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:template match="/">
-    <html>
-      <head>
-        <title>Welcome</title>
-      </head>
-      <body>
-        <font bgcolor="{member/favoriteColor}">
-          Welcome <xsl:value-of select="member/name"/>!
-        </font>
-        <xsl:if test="member[@level='platinum']">
-          Our special offer to platinum members today is something great
-        </xsl:if>
-        <table>
-          <tr><th>Type</th><th>Number</th></tr>
-          <xsl:for-each select="member/phone">
-            <tr>
-              <td><xsl:value-of select="@type"/></td>
-              <td><xsl:value-of select="."/></td>
-            </tr>
-          </xsl:for-each>
-        </table>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
-]]>         
-         </programlisting>
-         <para>
-            Within the "test" attribute the full array of Boolean and relative operators are available. The only caveat
-            is that since this is an XML document less than and greater than (<![CDATA["<"]]>,
-            ">") signs must be escaped as <![CDATA["&lt;" and "&gt;"]]>.
-         </para>
-      </section>
-      <section>
-         <title>xsl:choose</title>
-         <para>
-            One nuance of the
-            <![CDATA[<xsl:if>]]>
-            tag that is not always obvious at first glance is the lack of an "else" statement. This means to have an
-            else statement requires two ifs. The first one saying "if condition" and the second one saying “if not
-            condition”. This scheme quickly becomes unworkable with embedded if then else logic. Luckily XSLT
-            supports an
-            additional test operator called
-            <![CDATA[<xsl:choose>]]>
-            which works like a switch/case statement.
-         </para>
-         <programlisting>
-<![CDATA[
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-  <xsl:template match="/">
-    <html>
-      <head>
-        <title>Welcome</title>
-      </head>
-      <body>
-        <font bgcolor="{member/favoriteColor}">
-          Welcome <xsl:value-of select="member/name"/>!
-        </font>
-        <xsl:choose>
-          <xsl:when test="member[@level='platinum']">
-            Our special offer to platinum members today is something great
-          </xsl:when>
-          <xsl:otherwise>
-            Become a platinum member today!
-          </xsl:otherwise>
-        </xsl:choose>
-        <table>
-          <tr><th>Type</th><th>Number</th></tr>
-          <xsl:for-each select="member/phone">
-            <tr>
-              <td><xsl:value-of select="@type"/></td>
-              <td><xsl:value-of select="."/></td>
-            </tr>
-          </xsl:for-each>
-        </table>
-      </body>
-    </html>
-  </xsl:template>
-</xsl:stylesheet>
-]]>         
-         </programlisting>
-         <para>
-            The “test” attribute has the same capabilities/ constraints as the “test” attribute in the
-            <![CDATA[<xsl:if>]]>
-            tag. Multiple
-            <![CDATA[<xsl:when>]]>
-            blocks are allowed. As soon as one “when test” is mached, it will not evaluate any further “xsl:when
-            tests”
-            in the
-            <![CDATA[<xsl:choose>]]>
-            block.
-         </para>
-      </section>
-   </section>
-   <section>
-      <title>Conclusion</title>
-      <para>
-         With just these few commands (an admittedly small subset of XSLT) and a strong background in HTML (DHTML and
-         JavaScript
-         included), I believe web developers could meet the majority of their presentation needs. Obviously
-         there will
-         be cases where greater flexibility is required, but the advantage of this technique is that only
-         then, does the
-         developer need to learn those constructs.         
-      </para>
-      <para>
-         As a further benefit, this technique minimized the interdependence of one XLST construct on another. Local
-         changes stay
-         local thereby reducing the brittleness of solutions. The developer also no longer has to remember
-         and account
-         for XSLT’s default behaviors.         
-      </para>
-      <para>
-         I hope from these few examples, I have opened a few eyes to the power of XSLT and how a small change in how
-         XSLT is framed can make a huge difference in its understandability and accessibility to web developers. If
-         nothing else, I hope to encourage some good discussions. 
-      </para>
-   </section>
-</section>
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/concepts/concepts.xml b/docs/org.eclipse.wst.xsl.doc/docbook/concepts/concepts.xml
deleted file mode 100644
index 602a67a..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/concepts/concepts.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter>
-   <?dbhtml filename="concepts/concepts.html" ?>
-   <title>XSLT Concepts</title>
-   <para>
-         
-   </para>
-   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="RescuingXSLTfromNicheStatus.xml"/>
-   <section id="concepts_Resources">
-      <?dbhtml filename="concepts/resources.html" ?>
-      <title>Resources</title>
-      <itemizedlist>
-         <listitem>
-            <para>
-               <ulink url="http://www.w3.org/TR/xslt">XSLT 1.0 Specification</ulink> - The official W3C XSLT 1.0 Specification.
-            </para>
-         </listitem>
-         <listitem>
-            <para>
-               <ulink url="http://www.dpawson.co.uk/xsl/index.html">XSLT FAQ</ulink> - maintained by Dave Pawson.
-            </para>
-         </listitem>
-         <listitem>
-            <para><ulink url="http://www.xfront.com/rescuing-xslt.html">Rescuing XSLT from Niche Status</ulink> - by David Jacobs.</para>
-         </listitem>
-         <listitem>
-            <para><ulink url="http://www.xml.com/pub/a/2003/11/26/learnXSLT.html">Five XSLT Basics</ulink> - by Michael Fitzgerald author of Learning XSLT.</para>
-         </listitem>
-         <listitem>
-            <para><ulink url="http://www.xfront.com/files/tutorials.html">XFront Tutorials</ulink> - provides several tutorials include XSLT 1.0.</para>
-         </listitem>
-         <listitem>
-            <para><ulink url="http://www.cafeconleche.org/books/bible2/chapters/ch17.html">XSL Transformations</ulink> - Chapter 17 of the XML Bible 2nd Edition.</para>
-         </listitem>
-      </itemizedlist>
-   </section>
-   
-</chapter>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/concepts/gettingstarted.xml b/docs/org.eclipse.wst.xsl.doc/docbook/concepts/gettingstarted.xml
deleted file mode 100644
index ea3f41d..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/concepts/gettingstarted.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter>
-   <?dbhtml filename="introduction/gettingstarted.html" ?>
-   <title>Getting Started</title>
-   <para>  
-      Still trying to think of original content for this section.
-   </para>
-</chapter>
\ No newline at end of file
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 0729f71..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/editor/editor.xml
+++ /dev/null
@@ -1,367 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter>
-	<?dbhtml filename="editor/xsleditor.html" ?>
-    <title>XSL Editing</title>
-    <para>The XSL Tools 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.
-        </para>
-    </section>
-    <section id="ContentAssist">
-<?dbhtml filename="editor/xsleditor_contentassist.html" ?>
-        <title>Content Assist</title>
-        <para>
-            XSL Tools 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>
-        <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>
-        <para>To initiate content assistance press CTRL + SPACE or CMD + SPACE. This
-            will bring up a dialog that will contain any proposals that are available. If
-            no proposals are available an message will be displayed in the status bar.
-        </para>
-        <section id="ed_XSLProposals">
-            <title>XSLT Element Proposals</title>
-            <para>
-                Since XSLT is a templating language, it's elements must be able to be
-                added to the various markup it includes. The XSLT Editor will provide
-                content assistance and proposals for XSLT elements that are available to
-                be used within non-XSLT namespaced elements. This is depicted in
-                <xref linkend="fig_XSLProposals"/>
-                .
-            </para>
-            <figure id="fig_XSLProposals">
-                <title>XSLT Proposals within Non-XSLT elements</title>
-                <mediaobject>
-                    <imageobject>
-                        <imagedata align="center" fileref="../images/editor/xslproposals.png"/>
-                    </imageobject>
-                </mediaobject>
-            </figure>
-        </section>
-        <section id="SelectTest">
-            <title>Select, Test, and Match Attributes</title>
-            <para>
-                Where ever an xsl element supports a
-                <emphasis>select</emphasis>
-                ,
-                <emphasis>test</emphasis>
-                , or
-                <emphasis>match</emphasis>
-                attribute, content assistance is available. This includes support for the
-                following:
-            </para>
-            <itemizedlist>
-                <title>Select, Match and Test Assistance</title>
-                <listitem>
-                    <para>
-                        <emphasis>Variables</emphasis>
-                        - both local and global variables are supported within the current
-                        stylesheet. Any local or global variable will be added to the list
-                        and the name is prefixed with a dollar sign $ symbol.
-                    </para>
-                </listitem>
-                <listitem>
-                    <para>
-                        <emphasis>XPath 1.0</emphasis>
-                        - XPath 1.0 is supported through the use of templates. All of the
-                        XPath 1.0 and XSLT xpath extension functions are available, as
-                        well as
-                        <emphasis>axis</emphasis>
-                        operations. Currently XPath 2.0 is not supported directly, but
-                        will be added in the future.
-                    </para>
-                </listitem>
-            </itemizedlist>
-            <para>Content assistance for the select and test attributes is
-                intelligent enough to know that it is within an XPath expression, and will
-                try to determine and provide content assistance based on the current
-                cursor position. If a word has been partially typed it will filter the
-                available assistance.</para>
-        </section>
-        <section id="ExcludeResultPrefixesContentAssist">
-            <title>Exclude-Result-Prefixes</title>
-            <para>
-                The
-                <emphasis>exclude-result-prefixes</emphasis>
-                attribute in both XSLT 1.0 and XSLT 2.0 allows for the exclusion of
-                certain namespace declarations in the output document. The content
-                assistance populates a list of available namespaces that have been defined
-                in the stylseheet and provides them as proposals as shown in
-                <xref linkend="fig_ExcludeResultPrefixesContentAssist1"/>
-                .
-            </para>
-            <figure id="fig_ExcludeResultPrefixesContentAssist1">
-                <title>Exclude-result-prefixes Content Assistance
-                </title>
-                <mediaobject>
-                    <imageobject>
-                        <imagedata align="center"
-                            fileref="../images/editor/ExcludeContentAssist1.png"/>
-                    </imageobject>
-                </mediaobject>
-            </figure>
-            <para>
-                If the attribute has no values defined, then the
-                <emphasis>#all</emphasis>
-                value will be available in the list. If #all is already in the attributes
-                value, then no content assistance will be available.
-            </para>
-            <figure id="fig_ExcludeResultPrefixesContentAssist2">
-                <title>Filtered exclude-result-prefixes proposals</title>
-                <mediaobject>
-                    <imageobject>
-                        <imagedata align="center"
-                            fileref="../images/editor/ExcludeContentAssist2.png"/>
-                    </imageobject>
-                </mediaobject>
-            </figure>
-            <para>Content assistance is intelligent enough to know when a namespace
-                prefix is already in the list of excluded namespaces. In this case it will
-                not show the namespace in the proposal list.</para>
-            <note>
-                <title> Why isn't the XSL Namespace prefix in the proposals?</title>
-                <para>Currently the xsl prefix or any prefix that uses the XSL
-                    namespace is excluded from the list. This may be changed at a future
-                    date. This will depend on user feedback.</para>
-            </note>
-        </section>
-        <section id="ed_ModeAssist">
-            <title>Mode attribute assistance</title>
-            <para>
-                Content assistance is available for those xsl elements that support the
-                mode attribute. For XSLT 1.0 these elements are
-                <emphasis>template</emphasis>
-                ,
-                <emphasis>apply-templates</emphasis>
-                , and
-                <emphasis>apply-imports</emphasis>
-                .
-            </para>
-            <figure id="fig_ModeAssistance">
-                <title>Mode attribute assistance</title>
-                <mediaobject>
-                    <imageobject>
-                        <imagedata align="center" fileref="../images/editor/modeAssistance.png"
-                            format="PNG"/>
-                    </imageobject>
-                </mediaobject>
-            </figure>
-            <para>
-                The proposal list is populated by those modes defined on templates in the
-                current stylesheet, and any of the templates that are
-                <emphasis>included</emphasis>
-                or
-                <emphasis>imported</emphasis>
-                .
-            </para>
-        </section>
-        <section id="ed_NamedTemplateAssist">
-            <title>Named Template Assistance</title>
-            <para>
-                Call Named templates have content assistance available for their
-                <emphasis>name</emphasis>
-                attributes. This will provide a list of called-templates that have been
-                used, but have not yet been defined or overridden within the current
-                stylesheet.
-            </para>
-            <figure id="fig_NamedTemplates">
-                <title>Named Template Assistance</title>
-                <mediaobject>
-                    <imageobject>
-                        <imagedata align="center" fileref="../images/editor/namedTemplate.png"/>
-                    </imageobject>
-                </mediaobject>
-            </figure>
-        </section>
-        <section id="ed_CallTemplateAssist">
-            <title>Call-Template Assistance</title>
-            <para>
-                Any
-                <emphasis>call-template</emphasis>
-                xslt element has content assistance available for it's name attribute.
-                This will provide a list of possible XSLT named templates that can be
-                called from the current stylesheet. This takes into effect all included
-                and imported stylesheets as well as those defined in the current
-                stylesheet.
-            </para>
-            <figure id="fig_CallTemplateAssist">
-                <title>Call-Template Assistance</title>
-                <mediaobject>
-                    <imageobject>
-                        <imagedata align="center" fileref="../images/editor/calltemplate.png"/>
-                    </imageobject>
-                </mediaobject>
-            </figure>
-        </section>
-        <section id="ed_href">
-            <title>
-                Include and Import
-                <emphasis>href</emphasis>
-                Assistance
-            </title>
-            <para>XSLT stylesheets have the ability to import and include other
-                stylesheets. This allows for a modular structure for the templates to be
-                created. It also allows for easier maintenance. However, if one is working
-                with a large project like the DocBook Projects stylesheets it can be
-                difficult to remember the names and locations of all the stylesheets.
-            </para>
-            <para>
-                To this end, the XSLT editor provides content assistance for the
-                <emphasis>href</emphasis>
-                attribute. The scope of the assistance is restricted to the project that
-                the current stylesheet that is being editted resides.
-            </para>
-            <figure id="fig_HREFAssistance">
-                <title>Include/Import href Assistance</title>
-                <mediaobject>
-                    <imageobject>
-                        <imagedata align="center" fileref="../images/editor/hrefAssistance.png"/>
-                    </imageobject>
-                </mediaobject>
-            </figure>
-        </section>
-    </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>
-            <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="xsltSyntaxColoring">
-<?dbhtml filename="editor/xsleditor_coloring.html" ?>
-        <title>XSLT Syntax Coloring</title>
-        <para>
-            XSL Tools Editor can have syntax coloring that is specific just for the the
-            XSLT Namespace as showing in
-            <xref linkend="fig_editorSyntaxColoring"/>
-            .
-        </para>
-        <figure id="fig_editorSyntaxColoring">
-            <title>XSLT Specific Syntax Coloring</title>
-            <mediaobject>
-                <imageobject>
-                    <imagedata align="center" fileref="../images/editor/syntaxColoring.png"
-                        format="PNG"/>
-                </imageobject>
-            </mediaobject>
-        </figure>
-        <para>
-            The default coloring shown is to make all XSLT elements and attributes bold.
-            The settings are controled in
-            <xref linkend="XSLPreferences"/>
-            .
-        </para>
-    </section>
-    <section id="xsltMarkers">
-<?dbhtml filename="editor/xsleditor_markers.html" ?>
-        <title>XSLT Markers and Annotations</title>
-        <para>The XSL editor supports the ability to annotate or provide markers. These
-            annotations provide additional information about the templates and XSLT
-            elements in the stylesheet.</para>
-        <section id="xsltOverRide">
-            <title>Template Override</title>
-            <para>The XSLT editor will mark templates that have overriden an imported
-                template of the same name.</para>
-            <figure id="fig_OverRide1">
-                <title>Overriden Template</title>
-                <mediaobject>
-                    <imageobject>
-                        <imagedata align="center" fileref="../images/editor/override1.png"/>
-                    </imageobject>
-                </mediaobject>
-            </figure>
-            <para>
-                In
-                <xref linkend="fig_OverRide1"/>
-                , the template
-                <emphasis>TempB</emphasis>
-                overrides an imported template. By moving the mouse pointer over the
-                triangle icon in the rule bar, information about which file the original
-                template resides.
-            </para>
-            <figure id="fig_OverRide2">
-                <title>Overriden Template Information</title>
-                <mediaobject>
-                    <imageobject>
-                        <imagedata align="center" fileref="../images/editor/override2.png"/>
-                    </imageobject>
-                </mediaobject>
-            </figure>
-        </section>
-    </section>
-    <section id="XSLEditorDebugging">
-<?dbhtml filename="editor/xsleditor_debugging.html" ?>
-        <title>XSL Debugging</title>
-        <para>The XSL Editor supports the ability to specify break points within an XSL
-            File. If the file is included or imported and the break point is encountered
-            during a transformation scenario it will be respected. A break point may be
-            set at any valid XSL element or other xml element within the XSLT stylesheet.
-            See the Launching and Debugging section for more information on debugging XSLT
-            stylesheets.</para>
-    </section>
-    <section>
-<?dbhtml filename="editor/xsleditor_debugging.html" ?>
-        <title>Navigation</title>
-        <para>
-            Many of the variables, imports/includes, and templates can be navigated to
-            using the
-            <emphasis>Open Declaration (F3)</emphasis>
-            popup menu option. They can also be navigated to directly by CTRL-Clicking on
-            the name of the variable, import/include, or template. Items that currently
-            have hyperlinking navigation are:
-        </para>
-        <itemizedlist>
-            <listitem>
-                <para>Called-Templates</para>
-            </listitem>
-            <listitem>
-                <para>hrefs for Import and Includes</para>
-            </listitem>
-            <listitem>
-                <para>With-Param variables</para>
-            </listitem>
-        </itemizedlist>
-        <tip>
-            <title>Navigation to a Named Template in an included/imported
-                stylsheet</title>
-            <para> The hyperlinking ability will navigate you to where ever the first
-                definition of the template is defined. So if the template is defined
-                within the current stylesheet it will navigate to that definition. However
-                if it is defined in an imported or included stylesheet, or any of those
-                imported or included stylesheets it will take you to that definition. Use
-                the standard navigation errors to move back and forth during this
-                hyperlinking.</para>
-        </tip>
-    </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 b72c45a..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/general/general.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter>
-	<?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 Tools 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/editor/ExcludeContentAssist1.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/ExcludeContentAssist1.png
deleted file mode 100644
index 2f0f2cb..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/ExcludeContentAssist1.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/ExcludeContentAssist2.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/ExcludeContentAssist2.png
deleted file mode 100644
index 2e53677..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/ExcludeContentAssist2.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/calltemplate.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/calltemplate.png
deleted file mode 100644
index 3a13f07..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/calltemplate.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/hrefAssistance.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/hrefAssistance.png
deleted file mode 100644
index 5f44986..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/hrefAssistance.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/modeAssistance.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/modeAssistance.png
deleted file mode 100644
index f5a9875..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/modeAssistance.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/namedTemplate.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/namedTemplate.png
deleted file mode 100644
index b8bd926..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/namedTemplate.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/override1.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/override1.png
deleted file mode 100644
index 88b878b..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/override1.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/override2.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/override2.png
deleted file mode 100644
index cfc415c..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/override2.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/syntaxColoring.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/syntaxColoring.png
deleted file mode 100644
index 85e0ebd..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/syntaxColoring.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/xslproposals.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/xslproposals.png
deleted file mode 100644
index ffc127a..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/xslproposals.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/launchShortct.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/launchShortct.png
deleted file mode 100644
index 881813a..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/launchShortct.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/resultView.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/resultView.png
deleted file mode 100644
index d6d1b91..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/resultView.png
+++ /dev/null
Binary files differ
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/projectLevelValidation.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/projectLevelValidation.png
deleted file mode 100644
index 3ffe862..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/projectLevelValidation.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/xslSyntaxColoring.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xslSyntaxColoring.png
deleted file mode 100644
index 66ebef3..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/preferences/xslSyntaxColoring.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 8271e0b..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/launching/launching.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter>
-	<?dbhtml filename="launching/launching.html" ?>
-	<title>XSL Launching and Debugging</title>
-	<para>
-		XSL Tools 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/launching.html" ?>
-		<title>XSL Launching</title>
-		<para>
-			In the Project Explorer, simply select the input XML file and the stylesheet(s) to transform it, and then right-click and select 
-			<emphasis>Run As > XSL Transformation</emphasis>. 
-	    </para>
-		<mediaobject>
-			<imageobject>
-				<imagedata align="center" format="PNG"
-					fileref="../images/launching/launchShortct.png" />
-			</imageobject>
-		</mediaobject>
-	</section>
-	<section id="XSLDebug">
-	    <?dbhtml filename="launching/debugging.html" ?>
-		<title>XSLT Debugging</title>
-		<para>
-	   		XSL Tools provides a framework for XSLT processors to provide debugging support.  The support
-            provided is highly dependent on the processors.   XSL Tools comes with built in support
-            for the Xalan 2.7.1 processor.   Debugging is only available for those processors that
-            support the feature and plug into the extension point.
-	   </para>
-       <section>
-            <title>Result View</title>
-            <para>
-               The XSLT Debugger has a result view.  This will show the output that the
-               stylesheet has generated to the current break point or since the last step command was issued. 
-            </para>
-            <mediaobject>
-               <imageobject>
-                  <imagedata align="center" format="PNG"
-                     fileref="../images/launching/resultView.png" />
-               </imageobject>
-            </mediaobject>
-       </section>
-	</section>
-</chapter>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/legal.xml b/docs/org.eclipse.wst.xsl.doc/docbook/legal.xml
deleted file mode 100644
index 2fe8845..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/legal.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter>
-	<?dbhtml filename="legal.html" ?>
-	<title>Notices</title>
-	<para>
-      The material in this guide is Copyright (c) Doug Satchwell (<ulink url="http://www.chasetechnology.co.uk">Chase Technology Ltd</ulink>), 
-      David Carver (<ulink url="http://www.starstandard.org">Standards for Technology in Automotive Retail</ulink>)
-      and others 2008.
-    </para>
-    <para>
-		This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies 
-		this distribution, and is available at 
-		<ulink url="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</ulink>.
-    </para>
-	<para>
-		<ulink url="about.html">Terms and conditions regarding the use of this guide.</ulink>.
-	</para>
-</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 2f09466..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/preferences/preferences.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter id="XSLPreferences">
-	<?dbhtml filename="preferences/xslpreferences.html" ?>
-    <title>XSL Tools 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>
-    <figure id="fig_XSLPreferences">
-        <title>XSL Tools Preferences</title>
-        <mediaobject>
-            <imageobject>
-                <imagedata align="center" fileref="../images/preferences/xslpreferences.png"
-                    format="PNG"/>
-            </imageobject>
-        </mediaobject>
-    </figure>
-    <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 Tools 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 Tools 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 abilities 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 Tools 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>
-    <section id="pref_ProjectValidationPreferences">
-        <?dbhtml filename="preferences/validation.html" ?>
-        <title>Project Validation Preferences</title>
-        <para>
-            XSL Tools has the ability to set both workspace wide preferences for
-            validation as well as project level preferences. These preferences, as shown
-            in
-            <xref linkend="fig_ProjectLevelPreferences"/>
-            allow for the fine grain control of what the validator will consider to be an
-            syntax error.
-        </para>
-        <figure id="fig_ProjectLevelPreferences">
-            <title>Project Level Validation Preferences</title>
-            <mediaobject>
-                <imageobject>
-                    <imagedata align="center"
-                        fileref="../images/preferences/projectLevelValidation.png" format="PNG"/>
-                </imageobject>
-            </mediaobject>
-        </figure>
-        <para> These preferences are accessed via the Projects properties dialog.</para>
-    </section>
-    <section id="pref_SyntaxColoring">
-        <?dbhtml filename="preferences/syntaxColoring.html" ?>
-        <title>XSLT Syntax Coloring</title>
-        <para>
-            XSL Tools also has the ability to syntax color the XSLT namespace items a different
-            color than the rest of the XML syntax included.   The default is for all XSL syntax to be
-            <emphasis role="bold">bold</emphasis>.
-        </para>
-        <figure id="fig_XSLSyntaxColoringPreference">
-            <title>XSL Tools Syntax Coloring Preference</title>
-            <mediaobject>
-                <imageobject>
-                    <imagedata align="center"
-                        fileref="../images/preferences/xslSyntaxColoring.png" format="PNG"/>
-                </imageobject>
-            </mediaobject>
-        </figure>
-        <note>
-            <title>XML Colors</title>
-            <para>
-                The color for standard XML is still handled by the XML Files syntax coloring
-                preference page.   Changes made there are reflected in the XSL editor as well.
-            </para>
-        </note>
-    </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 710cf1c..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"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<chapter>
-	<?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 Tools</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 Tools</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 0066ce9..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/xslhelp.dbk
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-          "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<book id="XSLUser" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <bookinfo>
-      <title>XSL Tools 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="concepts/gettingstarted.xml"/>
-   <xi:include href="concepts/concepts.xml"/>
-   <xi:include href="editor/editor.xml"/>
-   <xi:include href="launching/launching.xml"/>
-   <xi:include href="preferences/preferences.xml"/>
-   <xi:include href="general/general.xml"/>
-   <xi:include href="samples/samples.xml"/>
-   <xi:include href="legal.xml"/>
-</book>
-
diff --git a/docs/org.eclipse.wst.xsl.doc/html/about.html b/docs/org.eclipse.wst.xsl.doc/html/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/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, 2008</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/docs/org.eclipse.wst.xsl.doc/html/book.css b/docs/org.eclipse.wst.xsl.doc/html/book.css
deleted file mode 100644
index e30f5af..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/book.css
+++ /dev/null
@@ -1,214 +0,0 @@
-p.Code {
-	display: block;
-	text-align: left;
-	text-indent: 0.00pt;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 15pt;
-	font-weight: normal;
-	font-style: normal;
-	color: #4444CC;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Courier New", Courier, monospace;
-}
-
-H6.CaptionFigColumn {
-	display: block;
-	text-align: left;
-	text-indent: 0.000000pt;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-	font-size: 75%;
-	font-weight: bold;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-
-p.Note {
-	display: block;
-	text-align: left;
-	text-indent: 0pt;
-	margin-top: 19.500000pt;
-	margin-bottom: 19.500000pt;
-	margin-right: 0.000000pt;
-	margin-left: 30pt;
-	font-size: 110%;
-	font-weight: normal;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-
-EM.UILabel {
-	font-weight: Bold;
-	font-style: normal;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-
-EM.CodeName {
-	font-weight: Bold;
-	font-style: normal;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Courier New", Courier, monospace;
-}
-
-UL.NavList {
-	margin-left: 1.5em;
-	padding-left: 0px;
-	list-style-type: none;
-}
-
-body,html {
-	border: 0px
-}
-
-/* following font face declarations need to be removed for DBCS */
-body,h1,h2,h3,h4,h5,h6,p,table,td,caption,th,ul,ol,dl,li,dd,dt {
-	font-family: Arial, Helvetica, sans-serif;
-	color: #000000
-}
-
-pre,code {
-	font-family: "Courier New", Courier, monospace;
-}
-
-/* end font face declarations */
-@media print {
-	html {
-		font-size: 12pt
-	}
-}
-
-body {
-	font-size: 83%;
-	background: #FFFFFF;
-	margin-bottom: 1em
-}
-
-h1 {
-	font-size: 180%;
-	margin-top: 5px;
-	margin-bottom: 1px
-}
-
-h2 {
-	font-size: 140%;
-	margin-top: 25px;
-	margin-bottom: 3px
-}
-
-h3 {
-	font-size: 110%;
-	margin-top: 20px;
-	margin-bottom: 3px
-}
-
-h4 {
-	font-size: 100%;
-	margin-top: 20px;
-	margin-bottom: 3px;
-	font-style: italic
-}
-
-p {
-	margin-top: 10px;
-	margin-bottom: 10px
-}
-
-pre {
-	font-size: 93%;
-	margin-left: 6;
-	color: #4444CC
-}
-
-code {
-	font-size: 93%;
-}
-
-table {
-	font-size: 100%
-}  /* needed for quirks mode */
-a:link {
-	color: #0000FF
-}
-
-a:hover {
-	color: #000080
-}
-
-a:visited {
-	text-decoration: underline
-}
-
-ul {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-li {
-	margin-top: 5px;
-	margin-bottom: 5px;
-}
-
-li p {
-	margin-top: 5px;
-	margin-bottom: 5px;
-}
-
-ol {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-dl {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-dt {
-	margin-top: 5px;
-	margin-bottom: 5px;
-	font-weight: bold;
-}
-
-dd {
-	margin-top: 5px;
-	margin-bottom: 5px;
-}
-
-strong {
-	font-weight: bold
-}
-
-em {
-	font-style: italic
-}
-
-var {
-	font-style: italic
-}
-
-div.revision {
-	border-left-style: solid;
-	border-left-width: thin;
-	border-left-color: #7B68EE;
-	padding-left: 5
-}
-
-th {
-	font-weight: bold
-}
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/concepts/concepts.html b/docs/org.eclipse.wst.xsl.doc/html/concepts/concepts.html
deleted file mode 100644
index 9fc2e53..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/concepts/concepts.html
+++ /dev/null
@@ -1,418 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSLT Concepts</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="../index.html" title="XSL Tools User Documentation"><link rel="prev" href="../introduction/gettingstarted.html" title="Getting Started"><link rel="next" href="resources.html" title="Resources"></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="N10019"></a>XSLT Concepts</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="concepts.html#ResucingXSLT">Rescuing XSLT From Niche Status</a></span></dt><dd><dl><dt><span class="section"><a href="concepts.html#N10034">The Problem</a></span></dt><dt><span class="section"><a href="concepts.html#N1005A">The Solution</a></span></dt><dt><span class="section"><a href="concepts.html#N10081">Queries</a></span></dt><dt><span class="section"><a href="concepts.html#N100AF">Conclusion</a></span></dt></dl></dd><dt><span class="section"><a href="resources.html">Resources</a></span></dt></dl></div><p>
-         
-   </p><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="ResucingXSLT"></a>Rescuing XSLT From Niche Status</h2></div><div><h3 class="subtitle">A Gentle Introduction to XSLT through HTML Templates</h3></div></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>
-         <span class="emphasis"><em>
-            Editors Note: This originally appeared at
-            <a class="ulink" href="http://www.xfront.com/rescuing-xslt.html" target="_top">XFront.com</a>
-            , and is republished here with permission. The article is written by David Jacobs.
-         </em></span>
-      </p></div><div class="abstract"><p class="title"><b>Abstract</b></p><p>
-         XSLT is one of the most exciting technologies to come out of the XML family. Unfortunately, its incredible
-         power and associated complexity can be overwhelming to new users preventing many from experimenting with it or
-         causing them to quickly give up in disgust. In fact, unless the method of teaching and the common style of use
-         for XSLT is radically changed to make it more accessible, XSLT will be relegated to niche status like SGML and
-         other powerful technologies.
-      </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="N10034"></a>The Problem</h3></div></div></div><p>
-         The 1990&rsquo;s saw an incredible proliferation of new web related languages. Looking back we can see what
-         features separated the winners and losers. The biggest key has been having a very low barrier to entry. Many
-         languages accomplished this by following the following rules.
-      </p><div class="itemizedlist"><ul type="disc"><li><p>
-               Leverage as much existing knowledge as possible.
-            </p></li><li><p>
-               Make it easy to get started with "hello world" style example.
-            </p></li><li><p>
-               The most common and useful language constructs should be easily conveyed with a few small examples.
-            </p></li><li><p>
-               Complex programming constructs should only be required when what is trying to be accomplished is
-               complex.            
-            </p></li></ul></div><p>
-         From these rules we can see why embedded web scripting languages like Active Server Pages (ASPs), Cold
-         Fusion, PHP and
-         Java Server Pages (JSPs) are so popular. They all leverage a user&rsquo;s knowledge of HTML. They also
-         allow the
-         minimum amount of scripting to be added to accomplish the dynamic feature a developer is looking for.
-         This has
-         allowed numerous web developers to start off with very small projects and then through continuos
-         enhancement
-         and learning, find themselves using the full power of a complex programming language. Furthermore,
-         because of
-         the very incremental nature of that learning the developer was never scared off.         
-      </p><p>
-         HTML has also fostered the technique of learning by example. When a web author sees another site with a
-         feature they
-         like, they immediately bring up the source to see how it was implemented. In this way many web
-         authors were
-         able to learn complex HTML tricks with no formal training. While server-side scripts are not as
-         easy to come
-         by, there are still numerous sites that house thousands of example scripts for a blossoming
-         developer to
-         examine.         
-      </p><p>
-         Traditionally XSLT has been presented as a programming language for translating XML documents into another
-         format, often for presentation. This frames the problem, such that for each element, the programmer has the
-         task of figuring out how that element needs to be translated. As long as there are one to one mappings or one
-         to zero mappings this is straightforward. For example, if every occurrence of a 
-         &lt;name&gt;
-         element is going to
-         become an HTML header. It is a simple matter to write a matching template to accomplish
-         this.
-      </p><a name="pl_NameTemplate"></a><pre class="programlisting">
-
-&lt;xsl:template match="name"&gt;
-  &lt;h1&gt;&lt;xsl:apply-templates/&gt;&lt;/h1&gt;
-&lt;/xsl:template&gt;
-      
-      </pre><p>
-         However when adding one to many mappings (i.e. when an element&rsquo;s contents will appear multiple times in the
-         target document with different formatting), keeping track of all the relationships quickly grows in complexity
-         and becomes confusing. For example, if, after writing the previous template, the programmer discovers that the
-         name also needs to be placed in the title the programmer might add the template
-      </p><a name="pl_valueOf"></a><pre class="programlisting">
-
-&lt;xsl:template match="/"&gt;
-  &lt;title&gt;&lt;xsl:value-of select="name"/&gt;&lt;/title&gt;
-&lt;/xsl:template&gt;
-      
-      </pre><p>
-         Notice the use of the &lt;xsl:value-of&gt;
-         function in this template because using &lt;apply-templates select="name"&gt;
-         would have caused a triggering of the previous template adding undesired header tags to my content. This means
-         before adding a translation to an element the programmer must first be aware of all the existing translations
-         (ugh!). Of course if the programmer became aware of the
-         &lt;title&gt;
-         requirement first, the contents of these templates could have been reversed. One can quickly see how
-         the
-         arbitrary decisions of development and discovery of requirements can lead to a set of templates that are
-         no
-         longer intuitive.
-      </p><p>
-         As a programmer with more than 20 years experience with over a dozen languages, XSLT templates and default
-         rules were
-         not obvious to me. Over the past year or two I had looked at numerous examples trying to discern how
-         they
-         worked. While I could understand the general gist of what was occurring, there was too much implied
-         behavior
-         that I did not pick up. It was not until going through formal XSLT training that I fully understood how
-         XSLT
-         worked. Clearly, if the barrier to entry is that high for an experienced programmer, the average web
-         developer
-         was not going to find this technology very useful.          
-      </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="N1005A"></a>The Solution</h3></div></div></div><p>
-         So how do we solve this problem and help deliver XSLT&rsquo;s promise to the masses? For XSLT to be successful it
-         must be
-         presented and used in a way that adopts those attributes discussed earlier (reuse of knowledge, fast
-         start, and
-         gradualism). This tutorial will attempt to ease XSLT&rsquo;s introduction by focusing on these attributes.
-         First, it
-         is only going to focus on the generation of HTML documents and users who are familiar with HTML. If
-         your goal
-         is to immediately start transforming one XML document into another XML document this tutorial is not
-         for you.
-      </p><p>
-         The second is to reframe the problem so the XSLT solutions programmers write are more naturally extensible
-         and
-         intuitive. Instead of trying to translate an XML source document into an HTML presentation document, the
-         programmer should see the XML document as a complex data structure with XSLT providing powerful tools for
-         extracting that information into their HTML documents. This allows us to leverage the experience most people
-         have with using an HTML templating language (e.g. ASP, PHP, JSP, Cold Fusion, Web Macro, etc). These templating
-         languages are all based on the basic premise that HTML comes first and all enhancements are then embedded in
-         special tags.         
-      </p><p>
-         With some caveats, this tutorial will show how XSLT can be used in this same way. The benefit of this
-         approach is it
-         allows the quick use of many of XSLT&rsquo;s powerful functions while letting you learn its more
-         esoteric
-         capabilities as the need arises. In addition the resulting XSLT files are more intuitive and
-         maintainable.
-      </p><pre class="programlisting">
-<span class="bold"><strong>&lt;xsl:value-of&gt; and {}</strong></span>         
-      </pre><p>
-         On to an example. Here is a very simple welcome page.         
-      </p><pre class="programlisting">
-
-&lt;html&gt;
-  &lt;head&gt;
-    &lt;title&gt;Welcome&lt;/title&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-    Welcome!
-  &lt;/body&gt;
-&lt;/html&gt;
-         
-      </pre><p>
-         And here is an XML document with information on member.      
-      </p><pre class="programlisting">
-
-&lt;?xml version="1.0"?&gt;
-&lt;xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;head&gt;
-        &lt;title&gt;Welcome&lt;/title&gt;
-      &lt;/head&gt;
-      &lt;body&gt;
-        Welcome &lt;xsl:value-of select="member/name"/&gt;!
-      &lt;/body&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-      
-      </pre><p>
-         There are a couple of things that need to be pointed out right away. First this is a well-formed XML
-         document. This mean all HTML used must conform to the XHTML specification (i.e. all tags must be closed and
-         lowercase).
-      </p><p>
-         The lines before the &lt;html&gt;
-         tag and after the &lt;/html&gt;
-         tag will be seen in all the examples. For now, other than realizing that they are required in any style sheet
-         created, just go ahead and forget they are there. You don&rsquo;t NEED to understand them right now to get useful
-         work out of XSLT.
-      </p><p>
-         Notice the HTML is identical to the original except for the introduction of a new tag
-         &lt;xsl:value-of&gt;.
-         This tag is the key to extracting any piece of information out an XML document. It has a "select"
-         attribute that
-         provides the path through the XML document to the information we seek. In this case
-            &lt;member&gt;
-         is the outer most tag and
-         &lt;name&gt;
-         is the tag underneath it. Slash characters ("/") are used to designate parent/child relationships
-         between tags.
-         If you are used to navigating around a Unix file system this should feel familiar.
-      </p><p>
-         Now let&rsquo;s consider further customizing this page by making the welcome in the person&rsquo;s favorite color using the
-         &lt;font&gt;
-         tag with the "bgcolor" attribute. Because
-            &lt;xsl:value-of&gt;
-         is an XML tag it is not valid to insert it in an HTML attribute value. So another mechanism
-         is needed to insert
-         information from our XML file there.
-      </p><pre class="programlisting">
-
-&lt;?xml version="1.0"?&gt;
-&lt;xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;head&gt;
-        &lt;title&gt;Welcome&lt;/title&gt;
-      &lt;/head&gt;
-      &lt;body&gt;
-        &lt;font bgcolor="{member/favoriteColor}"&gt;
-          Welcome &lt;xsl:value-of select="member/name"/&gt;!
-        &lt;/font&gt;
-      &lt;/body&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-
-      </pre><p>
-         Notice the use of the curly brackets ("{}"). When used within an attribute assignment "{path}" has the exact
-         same effect as
-         &lt;xsl:value-of select="path" /&gt;
-         used outside of attribute assignments.
-      </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="N10081"></a>Queries</h3></div></div></div><p>
-         Not all paths lead to a single node. For example, what if we wanted to put a person&rsquo;s home phone number on the
-         page? Notice that the XML document contains two phone entries. If we simply used
-         &lt;xsl:value-of select="member/phone" /&gt;
-         both entries would be returned. We obviously need a way to be more specific. Luckily, XSLT allows the full
-         power of XPath to describe the value(s) of interest. XPath allows conditions on any attribute or tag to be
-         placed in square brackets ("[]") which are then used to restrict the values returned.
-      </p><p>
-         So to retrieve the home phone number we would use the path "member/phone[@type=&rsquo;home&rsquo;]". Notice the "@"
-         symbol in front
-         of "type". The "@" symbol signifies that we are referring to an attribute. So our new HTML
-         template looks like:
-      </p><pre class="programlisting">
-      
-&lt;?xml version="1.0"?&gt;
-&lt;xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;head&gt;
-        &lt;title&gt;Welcome&lt;/title&gt;
-      &lt;/head&gt;
-      &lt;body&gt;
-        &lt;font bgcolor="{member/favoriteColor}"&gt;
-          Welcome &lt;xsl:value-of select="member/name"/&gt;!
-          &lt;br/&gt;
-          Your home phone number is:
-          <span class="bold"><strong>&lt;xsl:value-of select="member/phone[@type=&rsquo;home&rsquo;]"/&gt;</strong></span>
-        &lt;/font&gt;
-      &lt;/body
-    &lt;/html
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-
-      </pre><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="N1008F"></a>xsl:for-each</h4></div></div></div><p>
-            The previous example brings up another issue. What if this
-            &lt;member&gt;
-            entry had numerous phone numbers and we wanted to print them all on the web page. We could simply use
-               &lt;xsl:value-of select="member/phone" /&gt;
-            but this would not enable us to format the phone number into a nice list that describes the type of each
-            number.
-         </p><p>
-            To accomplish this requires the introduction of the
-            &lt;xsl:for-each&gt;
-            tag which allows us to loop through each of the elements that match a given path. So to
-            create a table that
-            contains the phone number type in the first column and the phone number in the second
-            column, the following
-            stylesheet could be used.
-         </p><pre class="programlisting">
-
-&lt;?xml version="1.0"?&gt;
-&lt;xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;head&gt;
-        &lt;title&gt;Welcome&lt;/title&gt;
-      &lt;/head&gt;
-      &lt;body&gt;
-        &lt;font bgcolor="{member/favoriteColor}"&gt;
-          Welcome &lt;xsl:value-of select="member/name"/&gt;!
-        &lt;/font&gt;
-        &lt;table&gt;
-          &lt;tr&gt;&lt;th&gt;Type&lt;/th&gt;&lt;th&gt;Number&lt;/th&gt;&lt;/tr&gt;
-          &lt;xsl:for-each select="member/phone"&gt;
-            &lt;tr&gt;
-              &lt;td&gt;&lt;xsl:value-of select="@type"/&gt;&lt;/td&gt;
-              &lt;td&gt;&lt;xsl:value-of select="."/&gt;&lt;/td&gt;
-            &lt;/tr&gt;
-          &lt;/xsl:for-each&gt;
-        &lt;/table&gt;
-      &lt;/body&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-         
-         </pre><p>
-            This example brings up a number of issues. First, while in the loop, all
-            &lt;xsl:value-of /&gt;
-            accesses are relative to the current element being iterated over (in this case
-            &lt;phone&gt;).
-            Notice the use of the period ("."), which like in a Unix file system means the current element.
-            So in this
-            case the period (".") refers to each phone element as the loop iterates. Also like in a file
-            system you can
-            address a parent element using a double period ("..") and can access any element in the
-            document by starting
-            over at the root element using a slash ("/").
-         </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="N1009B"></a>xsl:if</h4></div></div></div><p>
-            As a last enhancement to our page let&rsquo;s add a special offer to "platinum" level members. To do this requires
-            the use of a new tag
-            &lt;xsl:if&gt;
-            which allows us to insert content based on a condition of the data in the XML document.
-         </p><pre class="programlisting">
-
-&lt;?xml version="1.0"?&gt;
-&lt;xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;head&gt;
-        &lt;title&gt;Welcome&lt;/title&gt;
-      &lt;/head&gt;
-      &lt;body&gt;
-        &lt;font bgcolor="{member/favoriteColor}"&gt;
-          Welcome &lt;xsl:value-of select="member/name"/&gt;!
-        &lt;/font&gt;
-        &lt;xsl:if test="member[@level='platinum']"&gt;
-          Our special offer to platinum members today is something great
-        &lt;/xsl:if&gt;
-        &lt;table&gt;
-          &lt;tr&gt;&lt;th&gt;Type&lt;/th&gt;&lt;th&gt;Number&lt;/th&gt;&lt;/tr&gt;
-          &lt;xsl:for-each select="member/phone"&gt;
-            &lt;tr&gt;
-              &lt;td&gt;&lt;xsl:value-of select="@type"/&gt;&lt;/td&gt;
-              &lt;td&gt;&lt;xsl:value-of select="."/&gt;&lt;/td&gt;
-            &lt;/tr&gt;
-          &lt;/xsl:for-each&gt;
-        &lt;/table&gt;
-      &lt;/body&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-         
-         </pre><p>
-            Within the "test" attribute the full array of Boolean and relative operators are available. The only caveat
-            is that since this is an XML document less than and greater than ("&lt;",
-            "&gt;") signs must be escaped as "&amp;lt;" and "&amp;gt;".
-         </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="N100A5"></a>xsl:choose</h4></div></div></div><p>
-            One nuance of the
-            &lt;xsl:if&gt;
-            tag that is not always obvious at first glance is the lack of an "else" statement. This means to have an
-            else statement requires two ifs. The first one saying "if condition" and the second one saying &ldquo;if not
-            condition&rdquo;. This scheme quickly becomes unworkable with embedded if then else logic. Luckily XSLT
-            supports an
-            additional test operator called
-            &lt;xsl:choose&gt;
-            which works like a switch/case statement.
-         </p><pre class="programlisting">
-
-&lt;?xml version="1.0"?&gt;
-&lt;xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0"&gt;
-  &lt;xsl:template match="/"&gt;
-    &lt;html&gt;
-      &lt;head&gt;
-        &lt;title&gt;Welcome&lt;/title&gt;
-      &lt;/head&gt;
-      &lt;body&gt;
-        &lt;font bgcolor="{member/favoriteColor}"&gt;
-          Welcome &lt;xsl:value-of select="member/name"/&gt;!
-        &lt;/font&gt;
-        &lt;xsl:choose&gt;
-          &lt;xsl:when test="member[@level='platinum']"&gt;
-            Our special offer to platinum members today is something great
-          &lt;/xsl:when&gt;
-          &lt;xsl:otherwise&gt;
-            Become a platinum member today!
-          &lt;/xsl:otherwise&gt;
-        &lt;/xsl:choose&gt;
-        &lt;table&gt;
-          &lt;tr&gt;&lt;th&gt;Type&lt;/th&gt;&lt;th&gt;Number&lt;/th&gt;&lt;/tr&gt;
-          &lt;xsl:for-each select="member/phone"&gt;
-            &lt;tr&gt;
-              &lt;td&gt;&lt;xsl:value-of select="@type"/&gt;&lt;/td&gt;
-              &lt;td&gt;&lt;xsl:value-of select="."/&gt;&lt;/td&gt;
-            &lt;/tr&gt;
-          &lt;/xsl:for-each&gt;
-        &lt;/table&gt;
-      &lt;/body&gt;
-    &lt;/html&gt;
-  &lt;/xsl:template&gt;
-&lt;/xsl:stylesheet&gt;
-         
-         </pre><p>
-            The &ldquo;test&rdquo; attribute has the same capabilities/ constraints as the &ldquo;test&rdquo; attribute in the
-            &lt;xsl:if&gt;
-            tag. Multiple
-            &lt;xsl:when&gt;
-            blocks are allowed. As soon as one &ldquo;when test&rdquo; is mached, it will not evaluate any further &ldquo;xsl:when
-            tests&rdquo;
-            in the
-            &lt;xsl:choose&gt;
-            block.
-         </p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="N100AF"></a>Conclusion</h3></div></div></div><p>
-         With just these few commands (an admittedly small subset of XSLT) and a strong background in HTML (DHTML and
-         JavaScript
-         included), I believe web developers could meet the majority of their presentation needs. Obviously
-         there will
-         be cases where greater flexibility is required, but the advantage of this technique is that only
-         then, does the
-         developer need to learn those constructs.         
-      </p><p>
-         As a further benefit, this technique minimized the interdependence of one XLST construct on another. Local
-         changes stay
-         local thereby reducing the brittleness of solutions. The developer also no longer has to remember
-         and account
-         for XSLT&rsquo;s default behaviors.         
-      </p><p>
-         I hope from these few examples, I have opened a few eyes to the power of XSLT and how a small change in how
-         XSLT is framed can make a huge difference in its understandability and accessibility to web developers. If
-         nothing else, I hope to encourage some good discussions. 
-      </p></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/concepts/resources.html b/docs/org.eclipse.wst.xsl.doc/html/concepts/resources.html
deleted file mode 100644
index 2e83f04..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/concepts/resources.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Resources</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="concepts.html" title="XSLT Concepts"><link rel="prev" href="concepts.html" title="XSLT Concepts"><link rel="next" href="../editor/xsleditor.html" title="XSL Editing"></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="concepts_Resources"></a>Resources</h2></div></div></div><div class="itemizedlist"><ul type="disc"><li><p>
-               <a class="ulink" href="http://www.w3.org/TR/xslt" target="_top">XSLT 1.0 Specification</a> - The official W3C XSLT 1.0 Specification.
-            </p></li><li><p>
-               <a class="ulink" href="http://www.dpawson.co.uk/xsl/index.html" target="_top">XSLT FAQ</a> - maintained by Dave Pawson.
-            </p></li><li><p><a class="ulink" href="http://www.xfront.com/rescuing-xslt.html" target="_top">Rescuing XSLT from Niche Status</a> - by David Jacobs.</p></li><li><p><a class="ulink" href="http://www.xml.com/pub/a/2003/11/26/learnXSLT.html" target="_top">Five XSLT Basics</a> - by Michael Fitzgerald author of Learning XSLT.</p></li><li><p><a class="ulink" href="http://www.xfront.com/files/tutorials.html" target="_top">XFront Tutorials</a> - provides several tutorials include XSLT 1.0.</p></li><li><p><a class="ulink" href="http://www.cafeconleche.org/books/bible2/chapters/ch17.html" target="_top">XSL Transformations</a> - Chapter 17 of the XML Bible 2nd Edition.</p></li></ul></div></div></body></html>
\ No newline at end of file
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 3838333..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSL Editing</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="../index.html" title="XSL Tools User Documentation"><link rel="prev" href="../concepts/resources.html" title="Resources"><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="N100E4"></a>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><dd><dl><dt><span class="section"><a href="xsleditor_contentassist.html#ed_XSLProposals">XSLT Element Proposals</a></span></dt><dt><span class="section"><a href="xsleditor_contentassist.html#SelectTest">Select, Test, and Match Attributes</a></span></dt><dt><span class="section"><a href="xsleditor_contentassist.html#ExcludeResultPrefixesContentAssist">Exclude-Result-Prefixes</a></span></dt><dt><span class="section"><a href="xsleditor_contentassist.html#ed_ModeAssist">Mode attribute assistance</a></span></dt><dt><span class="section"><a href="xsleditor_contentassist.html#ed_NamedTemplateAssist">Named Template Assistance</a></span></dt><dt><span class="section"><a href="xsleditor_contentassist.html#ed_CallTemplateAssist">Call-Template Assistance</a></span></dt><dt><span class="section"><a href="xsleditor_contentassist.html#ed_href">
-                Include and Import
-                href
-                Assistance
-            </a></span></dt></dl></dd><dt><span class="section"><a href="xsleditor_templates.html">Templates</a></span></dt><dd><dl><dt><span class="section"><a href="xsleditor_templates.html#N101CC">XPath Templates</a></span></dt></dl></dd><dt><span class="section"><a href="xsleditor_coloring.html">XSLT Syntax Coloring</a></span></dt><dt><span class="section"><a href="xsleditor_markers.html">XSLT Markers and Annotations</a></span></dt><dd><dl><dt><span class="section"><a href="xsleditor_markers.html#xsltOverRide">Template Override</a></span></dt></dl></dd><dt><span class="section"><a href="xsleditor_debugging.html">XSL Debugging</a></span></dt><dt><span class="section"><a href="xsleditor_debugging.html">Navigation</a></span></dt></dl></div><p>The XSL Tools 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.
-        </p></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_coloring.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_coloring.html
deleted file mode 100644
index 4ecf215..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_coloring.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSLT Syntax Coloring</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="xsleditor.html" title="XSL Editing"><link rel="prev" href="xsleditor_templates.html" title="Templates"><link rel="next" href="xsleditor_markers.html" title="XSLT Markers and Annotations"></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="xsltSyntaxColoring"></a>XSLT Syntax Coloring</h2></div></div></div><p>
-            XSL Tools Editor can have syntax coloring that is specific just for the the
-            XSLT Namespace as showing in
-            <a class="xref" href="xsleditor_coloring.html#fig_editorSyntaxColoring" title="Figure&nbsp;8.&nbsp;XSLT Specific Syntax Coloring">Figure&nbsp;8, &ldquo;XSLT Specific Syntax Coloring&rdquo;</a>
-            .
-        </p><div class="figure"><a name="fig_editorSyntaxColoring"></a><p class="title"><b>Figure&nbsp;8.&nbsp;XSLT Specific Syntax Coloring</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/editor/syntaxColoring.png" align="middle" alt="XSLT Specific Syntax Coloring"></div></div></div><br class="figure-break"><p>
-            The default coloring shown is to make all XSLT elements and attributes bold.
-            The settings are controled in
-            <a class="xref" href="../preferences/xslpreferences.html" title="XSL Tools Preferences"><i>XSL Tools Preferences</i></a>
-            .
-        </p></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 3bdabdf..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Content Assist</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="xsleditor.html" title="XSL Editing"><link rel="prev" href="xsleditor.html" title="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 Tools 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><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><p>To initiate content assistance press CTRL + SPACE or CMD + SPACE. This
-            will bring up a dialog that will contain any proposals that are available. If
-            no proposals are available an message will be displayed in the status bar.
-        </p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="ed_XSLProposals"></a>XSLT Element Proposals</h3></div></div></div><p>
-                Since XSLT is a templating language, it's elements must be able to be
-                added to the various markup it includes. The XSLT Editor will provide
-                content assistance and proposals for XSLT elements that are available to
-                be used within non-XSLT namespaced elements. This is depicted in
-                <a class="xref" href="xsleditor_contentassist.html#fig_XSLProposals" title="Figure&nbsp;1.&nbsp;XSLT Proposals within Non-XSLT elements">Figure&nbsp;1, &ldquo;XSLT Proposals within Non-XSLT elements&rdquo;</a>
-                .
-            </p><div class="figure"><a name="fig_XSLProposals"></a><p class="title"><b>Figure&nbsp;1.&nbsp;XSLT Proposals within Non-XSLT elements</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/editor/xslproposals.png" align="middle" alt="XSLT Proposals within Non-XSLT elements"></div></div></div><br class="figure-break"></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="SelectTest"></a>Select, Test, and Match Attributes</h3></div></div></div><p>
-                Where ever an xsl element supports a
-                <span class="emphasis"><em>select</em></span>
-                ,
-                <span class="emphasis"><em>test</em></span>
-                , or
-                <span class="emphasis"><em>match</em></span>
-                attribute, content assistance is available. This includes support for the
-                following:
-            </p><div class="itemizedlist"><p class="title"><b>Select, Match and Test Assistance</b></p><ul type="disc"><li><p>
-                        <span class="emphasis"><em>Variables</em></span>
-                        - both local and global variables are supported within the current
-                        stylesheet. Any local or global variable will be added to the list
-                        and the name is prefixed with a dollar sign $ symbol.
-                    </p></li><li><p>
-                        <span class="emphasis"><em>XPath 1.0</em></span>
-                        - XPath 1.0 is supported through the use of templates. All of the
-                        XPath 1.0 and XSLT xpath extension functions are available, as
-                        well as
-                        <span class="emphasis"><em>axis</em></span>
-                        operations. Currently XPath 2.0 is not supported directly, but
-                        will be added in the future.
-                    </p></li></ul></div><p>Content assistance for the select and test attributes is
-                intelligent enough to know that it is within an XPath expression, and will
-                try to determine and provide content assistance based on the current
-                cursor position. If a word has been partially typed it will filter the
-                available assistance.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="ExcludeResultPrefixesContentAssist"></a>Exclude-Result-Prefixes</h3></div></div></div><p>
-                The
-                <span class="emphasis"><em>exclude-result-prefixes</em></span>
-                attribute in both XSLT 1.0 and XSLT 2.0 allows for the exclusion of
-                certain namespace declarations in the output document. The content
-                assistance populates a list of available namespaces that have been defined
-                in the stylseheet and provides them as proposals as shown in
-                <a class="xref" href="xsleditor_contentassist.html#fig_ExcludeResultPrefixesContentAssist1" title="Figure&nbsp;2.&nbsp;Exclude-result-prefixes Content Assistance">Figure&nbsp;2, &ldquo;Exclude-result-prefixes Content Assistance
-                &rdquo;</a>
-                .
-            </p><div class="figure"><a name="fig_ExcludeResultPrefixesContentAssist1"></a><p class="title"><b>Figure&nbsp;2.&nbsp;Exclude-result-prefixes Content Assistance
-                </b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/editor/ExcludeContentAssist1.png" align="middle" alt="Exclude-result-prefixes Content Assistance"></div></div></div><br class="figure-break"><p>
-                If the attribute has no values defined, then the
-                <span class="emphasis"><em>#all</em></span>
-                value will be available in the list. If #all is already in the attributes
-                value, then no content assistance will be available.
-            </p><div class="figure"><a name="fig_ExcludeResultPrefixesContentAssist2"></a><p class="title"><b>Figure&nbsp;3.&nbsp;Filtered exclude-result-prefixes proposals</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/editor/ExcludeContentAssist2.png" align="middle" alt="Filtered exclude-result-prefixes proposals"></div></div></div><br class="figure-break"><p>Content assistance is intelligent enough to know when a namespace
-                prefix is already in the list of excluded namespaces. In this case it will
-                not show the namespace in the proposal list.</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title"> Why isn't the XSL Namespace prefix in the proposals?</h3><p>Currently the xsl prefix or any prefix that uses the XSL
-                    namespace is excluded from the list. This may be changed at a future
-                    date. This will depend on user feedback.</p></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="ed_ModeAssist"></a>Mode attribute assistance</h3></div></div></div><p>
-                Content assistance is available for those xsl elements that support the
-                mode attribute. For XSLT 1.0 these elements are
-                <span class="emphasis"><em>template</em></span>
-                ,
-                <span class="emphasis"><em>apply-templates</em></span>
-                , and
-                <span class="emphasis"><em>apply-imports</em></span>
-                .
-            </p><div class="figure"><a name="fig_ModeAssistance"></a><p class="title"><b>Figure&nbsp;4.&nbsp;Mode attribute assistance</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/editor/modeAssistance.png" align="middle" alt="Mode attribute assistance"></div></div></div><br class="figure-break"><p>
-                The proposal list is populated by those modes defined on templates in the
-                current stylesheet, and any of the templates that are
-                <span class="emphasis"><em>included</em></span>
-                or
-                <span class="emphasis"><em>imported</em></span>
-                .
-            </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="ed_NamedTemplateAssist"></a>Named Template Assistance</h3></div></div></div><p>
-                Call Named templates have content assistance available for their
-                <span class="emphasis"><em>name</em></span>
-                attributes. This will provide a list of called-templates that have been
-                used, but have not yet been defined or overridden within the current
-                stylesheet.
-            </p><div class="figure"><a name="fig_NamedTemplates"></a><p class="title"><b>Figure&nbsp;5.&nbsp;Named Template Assistance</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/editor/namedTemplate.png" align="middle" alt="Named Template Assistance"></div></div></div><br class="figure-break"></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="ed_CallTemplateAssist"></a>Call-Template Assistance</h3></div></div></div><p>
-                Any
-                <span class="emphasis"><em>call-template</em></span>
-                xslt element has content assistance available for it's name attribute.
-                This will provide a list of possible XSLT named templates that can be
-                called from the current stylesheet. This takes into effect all included
-                and imported stylesheets as well as those defined in the current
-                stylesheet.
-            </p><div class="figure"><a name="fig_CallTemplateAssist"></a><p class="title"><b>Figure&nbsp;6.&nbsp;Call-Template Assistance</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/editor/calltemplate.png" align="middle" alt="Call-Template Assistance"></div></div></div><br class="figure-break"></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="ed_href"></a>
-                Include and Import
-                <span class="emphasis"><em>href</em></span>
-                Assistance
-            </h3></div></div></div><p>XSLT stylesheets have the ability to import and include other
-                stylesheets. This allows for a modular structure for the templates to be
-                created. It also allows for easier maintenance. However, if one is working
-                with a large project like the DocBook Projects stylesheets it can be
-                difficult to remember the names and locations of all the stylesheets.
-            </p><p>
-                To this end, the XSLT editor provides content assistance for the
-                <span class="emphasis"><em>href</em></span>
-                attribute. The scope of the assistance is restricted to the project that
-                the current stylesheet that is being editted resides.
-            </p><div class="figure"><a name="fig_HREFAssistance"></a><p class="title"><b>Figure&nbsp;7.&nbsp;Include/Import href Assistance</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/editor/hrefAssistance.png" align="middle" alt="Include/Import href Assistance"></div></div></div><br class="figure-break"></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 84ea25a..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_debugging.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Navigation</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="xsleditor.html" title="XSL Editing"><link rel="prev" href="xsleditor_debugging.html" title="XSL Debugging"><link rel="next" href="../launching/launching.html" title="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="N1021B"></a>Navigation</h2></div></div></div><p>
-            Many of the variables, imports/includes, and templates can be navigated to
-            using the
-            <span class="emphasis"><em>Open Declaration (F3)</em></span>
-            popup menu option. They can also be navigated to directly by CTRL-Clicking on
-            the name of the variable, import/include, or template. Items that currently
-            have hyperlinking navigation are:
-        </p><div class="itemizedlist"><ul type="disc"><li><p>Called-Templates</p></li><li><p>hrefs for Import and Includes</p></li><li><p>With-Param variables</p></li></ul></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Navigation to a Named Template in an included/imported
-                stylsheet</h3><p> The hyperlinking ability will navigate you to where ever the first
-                definition of the template is defined. So if the template is defined
-                within the current stylesheet it will navigate to that definition. However
-                if it is defined in an imported or included stylesheet, or any of those
-                imported or included stylesheets it will take you to that definition. Use
-                the standard navigation errors to move back and forth during this
-                hyperlinking.</p></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_markers.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_markers.html
deleted file mode 100644
index 2937160..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_markers.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSLT Markers and Annotations</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="xsleditor.html" title="XSL Editing"><link rel="prev" href="xsleditor_coloring.html" title="XSLT Syntax Coloring"><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="xsltMarkers"></a>XSLT Markers and Annotations</h2></div></div></div><p>The XSL editor supports the ability to annotate or provide markers. These
-            annotations provide additional information about the templates and XSLT
-            elements in the stylesheet.</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="xsltOverRide"></a>Template Override</h3></div></div></div><p>The XSLT editor will mark templates that have overriden an imported
-                template of the same name.</p><div class="figure"><a name="fig_OverRide1"></a><p class="title"><b>Figure&nbsp;9.&nbsp;Overriden Template</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/editor/override1.png" align="middle" alt="Overriden Template"></div></div></div><br class="figure-break"><p>
-                In
-                <a class="xref" href="xsleditor_markers.html#fig_OverRide1" title="Figure&nbsp;9.&nbsp;Overriden Template">Figure&nbsp;9, &ldquo;Overriden Template&rdquo;</a>
-                , the template
-                <span class="emphasis"><em>TempB</em></span>
-                overrides an imported template. By moving the mouse pointer over the
-                triangle icon in the rule bar, information about which file the original
-                template resides.
-            </p><div class="figure"><a name="fig_OverRide2"></a><p class="title"><b>Figure&nbsp;10.&nbsp;Overriden Template Information</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/editor/override2.png" align="middle" alt="Overriden Template Information"></div></div></div><br class="figure-break"></div></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 256c0cb..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_templates.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Templates</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="xsleditor.html" title="XSL Editing"><link rel="prev" href="xsleditor_contentassist.html" title="Content Assist"><link rel="next" href="xsleditor_coloring.html" title="XSLT Syntax Coloring"></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="N101CC"></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 6b11fd0..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>General</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="../index.html" title="XSL Tools User Documentation"><link rel="prev" href="../preferences/syntaxColoring.html" title="XSLT Syntax Coloring"><link rel="next" href="../samples/samples.html" title="XSL Tooling Samples"></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="N10321"></a>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 Tools 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="N1034C"></a><p class="title"><b>Example&nbsp;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/editor/ExcludeContentAssist1.png b/docs/org.eclipse.wst.xsl.doc/html/images/editor/ExcludeContentAssist1.png
deleted file mode 100644
index 2f0f2cb..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/editor/ExcludeContentAssist1.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/editor/ExcludeContentAssist2.png b/docs/org.eclipse.wst.xsl.doc/html/images/editor/ExcludeContentAssist2.png
deleted file mode 100644
index 2e53677..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/editor/ExcludeContentAssist2.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/editor/calltemplate.png b/docs/org.eclipse.wst.xsl.doc/html/images/editor/calltemplate.png
deleted file mode 100644
index 3a13f07..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/editor/calltemplate.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/editor/hrefAssistance.png b/docs/org.eclipse.wst.xsl.doc/html/images/editor/hrefAssistance.png
deleted file mode 100644
index 5f44986..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/editor/hrefAssistance.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/editor/modeAssistance.png b/docs/org.eclipse.wst.xsl.doc/html/images/editor/modeAssistance.png
deleted file mode 100644
index f5a9875..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/editor/modeAssistance.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/editor/namedTemplate.png b/docs/org.eclipse.wst.xsl.doc/html/images/editor/namedTemplate.png
deleted file mode 100644
index b8bd926..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/editor/namedTemplate.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/editor/override1.png b/docs/org.eclipse.wst.xsl.doc/html/images/editor/override1.png
deleted file mode 100644
index 88b878b..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/editor/override1.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/editor/override2.png b/docs/org.eclipse.wst.xsl.doc/html/images/editor/override2.png
deleted file mode 100644
index cfc415c..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/editor/override2.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/editor/syntaxColoring.png b/docs/org.eclipse.wst.xsl.doc/html/images/editor/syntaxColoring.png
deleted file mode 100644
index 85e0ebd..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/editor/syntaxColoring.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/editor/xslproposals.png b/docs/org.eclipse.wst.xsl.doc/html/images/editor/xslproposals.png
deleted file mode 100644
index ffc127a..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/editor/xslproposals.png
+++ /dev/null
Binary files differ
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/launching/launchShortct.png b/docs/org.eclipse.wst.xsl.doc/html/images/launching/launchShortct.png
deleted file mode 100644
index 881813a..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/launching/launchShortct.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/launching/resultView.png b/docs/org.eclipse.wst.xsl.doc/html/images/launching/resultView.png
deleted file mode 100644
index d6d1b91..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/launching/resultView.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/projectLevelValidation.png b/docs/org.eclipse.wst.xsl.doc/html/images/preferences/projectLevelValidation.png
deleted file mode 100644
index 3ffe862..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/projectLevelValidation.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/xslSyntaxColoring.png b/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xslSyntaxColoring.png
deleted file mode 100644
index 66ebef3..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/preferences/xslSyntaxColoring.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 37ba12b..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSL Tools User Documentation</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="index.html" title="XSL Tools User Documentation"><link rel="next" href="introduction/gettingstarted.html" title="Getting Started"></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 Tools 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="introduction/gettingstarted.html">Getting Started</a></span></dt><dt><span class="chapter"><a href="concepts/concepts.html">XSLT Concepts</a></span></dt><dd><dl><dt><span class="section"><a href="concepts/concepts.html#ResucingXSLT">Rescuing XSLT From Niche Status</a></span></dt><dd><dl><dt><span class="section"><a href="concepts/concepts.html#N10034">The Problem</a></span></dt><dt><span class="section"><a href="concepts/concepts.html#N1005A">The Solution</a></span></dt><dt><span class="section"><a href="concepts/concepts.html#N10081">Queries</a></span></dt><dt><span class="section"><a href="concepts/concepts.html#N100AF">Conclusion</a></span></dt></dl></dd><dt><span class="section"><a href="concepts/resources.html">Resources</a></span></dt></dl></dd><dt><span class="chapter"><a href="editor/xsleditor.html">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><dd><dl><dt><span class="section"><a href="editor/xsleditor_contentassist.html#ed_XSLProposals">XSLT Element Proposals</a></span></dt><dt><span class="section"><a href="editor/xsleditor_contentassist.html#SelectTest">Select, Test, and Match Attributes</a></span></dt><dt><span class="section"><a href="editor/xsleditor_contentassist.html#ExcludeResultPrefixesContentAssist">Exclude-Result-Prefixes</a></span></dt><dt><span class="section"><a href="editor/xsleditor_contentassist.html#ed_ModeAssist">Mode attribute assistance</a></span></dt><dt><span class="section"><a href="editor/xsleditor_contentassist.html#ed_NamedTemplateAssist">Named Template Assistance</a></span></dt><dt><span class="section"><a href="editor/xsleditor_contentassist.html#ed_CallTemplateAssist">Call-Template Assistance</a></span></dt><dt><span class="section"><a href="editor/xsleditor_contentassist.html#ed_href">
-                Include and Import
-                href
-                Assistance
-            </a></span></dt></dl></dd><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#N101CC">XPath Templates</a></span></dt></dl></dd><dt><span class="section"><a href="editor/xsleditor_coloring.html">XSLT Syntax Coloring</a></span></dt><dt><span class="section"><a href="editor/xsleditor_markers.html">XSLT Markers and Annotations</a></span></dt><dd><dl><dt><span class="section"><a href="editor/xsleditor_markers.html#xsltOverRide">Template Override</a></span></dt></dl></dd><dt><span class="section"><a href="editor/xsleditor_debugging.html">XSL Debugging</a></span></dt><dt><span class="section"><a href="editor/xsleditor_debugging.html">Navigation</a></span></dt></dl></dd><dt><span class="chapter"><a href="launching/launching.html">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/debugging.html">XSLT Debugging</a></span></dt><dd><dl><dt><span class="section"><a href="launching/debugging.html#N10251">Result View</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="preferences/xslpreferences.html">XSL Tools 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><dt><span class="section"><a href="preferences/validation.html">Project Validation Preferences</a></span></dt><dt><span class="section"><a href="preferences/syntaxColoring.html">XSLT Syntax Coloring</a></span></dt></dl></dd><dt><span class="chapter"><a href="general/general.html">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="samples/samples.html">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 Tools</a></span></dt><dt><span class="section"><a href="samples/samples.html#DITAEclipseHelp">Creating Eclipse Help with DITA and XSL Tools</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="legal.html">Notices</a></span></dt></dl></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/index.xml b/docs/org.eclipse.wst.xsl.doc/html/index.xml
deleted file mode 100644
index f515bc8..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/index.xml
+++ /dev/null
@@ -1 +0,0 @@
-<index></index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/introduction/gettingstarted.html b/docs/org.eclipse.wst.xsl.doc/html/introduction/gettingstarted.html
deleted file mode 100644
index 868102f..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/introduction/gettingstarted.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Getting Started</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="../index.html" title="XSL Tools User Documentation"><link rel="prev" href="../index.html" title="XSL Tools User Documentation"><link rel="next" href="../concepts/concepts.html" title="XSLT Concepts"></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="N10012"></a>Getting Started</h2></div></div></div><p>  
-      Still trying to think of original content for this section.
-   </p></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/launching/debugging.html b/docs/org.eclipse.wst.xsl.doc/html/launching/debugging.html
deleted file mode 100644
index 46f815e..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/launching/debugging.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSLT Debugging</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="launching.html" title="XSL Launching and Debugging"><link rel="prev" href="launching.html" title="XSL Launching and Debugging"><link rel="next" href="../preferences/xslpreferences.html" title="XSL Tools 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>XSLT Debugging</h2></div></div></div><p>
-	   		XSL Tools provides a framework for XSLT processors to provide debugging support.  The support
-            provided is highly dependent on the processors.   XSL Tools comes with built in support
-            for the Xalan 2.7.1 processor.   Debugging is only available for those processors that
-            support the feature and plug into the extension point.
-	   </p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="N10251"></a>Result View</h3></div></div></div><p>
-               The XSLT Debugger has a result view.  This will show the output that the
-               stylesheet has generated to the current break point or since the last step command was issued. 
-            </p><div class="mediaobject" align="center"><img src="../images/launching/resultView.png" align="middle"></div></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 3988d97..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.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools 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 Tools 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 9bd82e7..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/launching/launching.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSL Launching and Debugging</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="../index.html" title="XSL Tools User Documentation"><link rel="prev" href="../editor/xsleditor_debugging.html" title="Navigation"><link rel="next" href="debugging.html" title="XSLT 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="N10233"></a>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="debugging.html">XSLT Debugging</a></span></dt><dd><dl><dt><span class="section"><a href="debugging.html#N10251">Result View</a></span></dt></dl></dd></dl></div><p>
-		XSL Tools 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>
-			In the Project Explorer, simply select the input XML file and the stylesheet(s) to transform it, and then right-click and select 
-			<span class="emphasis"><em>Run As &gt; XSL Transformation</em></span>. 
-	    </p><div class="mediaobject" align="center"><img src="../images/launching/launchShortct.png" align="middle"></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/legal.html b/docs/org.eclipse.wst.xsl.doc/html/legal.html
deleted file mode 100644
index cf40814..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/legal.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Notices</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="index.html" title="XSL Tools User Documentation"><link rel="up" href="index.html" title="XSL Tools User Documentation"><link rel="prev" href="samples/samples.html" title="XSL Tooling Samples"></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="N10372"></a>Notices</h2></div></div></div><p>
-      The material in this guide is Copyright (c) Doug Satchwell (<a class="ulink" href="http://www.chasetechnology.co.uk" target="_top">Chase Technology Ltd</a>), 
-      David Carver (<a class="ulink" href="http://www.starstandard.org" target="_top">Standards for Technology in Automotive Retail</a>)
-      and others 2008.
-    </p><p>
-		This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies 
-		this distribution, and is available at 
-		<a class="ulink" href="http://www.eclipse.org/legal/epl-v10.html" target="_top">http://www.eclipse.org/legal/epl-v10.html</a>.
-    </p><p>
-		<a class="ulink" href="about.html" target="_top">Terms and conditions regarding the use of this guide.</a>.
-	</p></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/preferences/syntaxColoring.html b/docs/org.eclipse.wst.xsl.doc/html/preferences/syntaxColoring.html
deleted file mode 100644
index 8d70740..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/syntaxColoring.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSLT Syntax Coloring</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="xslpreferences.html" title="XSL Tools Preferences"><link rel="prev" href="validation.html" title="Project Validation Preferences"><link rel="next" href="../general/general.html" title="General"></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="pref_SyntaxColoring"></a>XSLT Syntax Coloring</h2></div></div></div><p>
-            XSL Tools also has the ability to syntax color the XSLT namespace items a different
-            color than the rest of the XML syntax included.   The default is for all XSL syntax to
-            bold.
-        </p><div class="figure"><a name="fig_XSLSyntaxColoringPreference"></a><p class="title"><b>Figure&nbsp;13.&nbsp;XSL Tools Syntax Coloring Preference</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/preferences/xslSyntaxColoring.png" align="middle" alt="XSL Tools Syntax Coloring Preference"></div></div></div><br class="figure-break"><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">XML Colors</h3><p>
-                The color for standard XML is still handled by the XML Files syntax coloring
-                preference page.   Changes made there are reflected in the XSL editor as well.
-            </p></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/preferences/validation.html b/docs/org.eclipse.wst.xsl.doc/html/preferences/validation.html
deleted file mode 100644
index c151f7d..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/validation.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Project Validation Preferences</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="xslpreferences.html" title="XSL Tools Preferences"><link rel="prev" href="xpathtemplates.html" title="XPath Templates"><link rel="next" href="syntaxColoring.html" title="XSLT Syntax Coloring"></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="pref_ProjectValidationPreferences"></a>Project Validation Preferences</h2></div></div></div><p>
-            XSL Tools has the ability to set both workspace wide preferences for
-            validation as well as project level preferences. These preferences, as shown
-            in
-            <a class="xref" href="validation.html#fig_ProjectLevelPreferences" title="Figure&nbsp;12.&nbsp;Project Level Validation Preferences">Figure&nbsp;12, &ldquo;Project Level Validation Preferences&rdquo;</a>
-            allow for the fine grain control of what the validator will consider to be an
-            syntax error.
-        </p><div class="figure"><a name="fig_ProjectLevelPreferences"></a><p class="title"><b>Figure&nbsp;12.&nbsp;Project Level Validation Preferences</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/preferences/projectLevelValidation.png" align="middle" alt="Project Level Validation Preferences"></div></div></div><br class="figure-break"><p> These preferences are accessed via the Projects properties dialog.</p></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 7215254..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/xpathtemplates.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XPath Templates</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="xslpreferences.html" title="XSL Tools Preferences"><link rel="prev" href="xsloutputproperties.html" title="Output Properties"><link rel="next" href="validation.html" title="Project Validation 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="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 Tools 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 2f1b66c..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/xsloutputproperties.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Output Properties</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="xslpreferences.html" title="XSL Tools 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 c919ab4..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/xslpreferences.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSL Tools Preferences</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="../index.html" title="XSL Tools User Documentation"><link rel="prev" href="../launching/debugging.html" title="XSLT 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>XSL Tools 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><dt><span class="section"><a href="validation.html">Project Validation Preferences</a></span></dt><dt><span class="section"><a href="syntaxColoring.html">XSLT Syntax Coloring</a></span></dt></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="figure"><a name="fig_XSLPreferences"></a><p class="title"><b>Figure&nbsp;11.&nbsp;XSL Tools Preferences</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/preferences/xslpreferences.png" align="middle" alt="XSL Tools Preferences"></div></div></div><br class="figure-break"><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 Tools 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 Tools 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 abilities 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 ff799fc..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/xslprocessors.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Installed Processors</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="xslpreferences.html" title="XSL Tools Preferences"><link rel="prev" href="xslpreferences.html" title="XSL Tools 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 b96818c..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>XSL Tooling Samples</title><link href="book.css" rel="stylesheet" type="text/css"><link href="../book.css" rel="stylesheet" type="text/css"><meta content="DocBook XSL Stylesheets V1.74.0" name="generator"><link rel="home" href="../index.html" title="XSL Tools User Documentation"><link rel="up" href="../index.html" title="XSL Tools User Documentation"><link rel="prev" href="../general/general.html" title="General"><link rel="next" href="../legal.html" title="Notices"></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="N10353"></a>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 Tools</a></span></dt><dt><span class="section"><a href="samples.html#DITAEclipseHelp">Creating Eclipse Help with DITA and XSL Tools</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 Tools</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 Tools</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.properties b/docs/org.eclipse.wst.xsl.doc/plugin.properties
deleted file mode 100644
index ca15f82..0000000
--- a/docs/org.eclipse.wst.xsl.doc/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.doc
-vendorName = Eclipse.org
-pluginName = XSL User Documentation (Incubating)
\ 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/toc.xml b/docs/org.eclipse.wst.xsl.doc/toc.xml
deleted file mode 100644
index 09daf22..0000000
--- a/docs/org.eclipse.wst.xsl.doc/toc.xml
+++ /dev/null
@@ -1 +0,0 @@
-<toc topic="html/index.html" label="XSL Tools User Documentation"><topic href="html/introduction/gettingstarted.html" label="Getting Started"></topic><topic href="html/concepts/concepts.html" label="XSLT Concepts"><topic href="html/concepts/concepts.html#ResucingXSLT" label="Rescuing XSLT From Niche Status"><topic href="html/concepts/concepts.html#N10034" label="The Problem"></topic><topic href="html/concepts/concepts.html#N1005A" label="The Solution"></topic><topic href="html/concepts/concepts.html#N10081" label="Queries"><topic href="html/concepts/concepts.html#N1008F" label="xsl:for-each"></topic><topic href="html/concepts/concepts.html#N1009B" label="xsl:if"></topic><topic href="html/concepts/concepts.html#N100A5" label="xsl:choose"></topic></topic><topic href="html/concepts/concepts.html#N100AF" label="Conclusion"></topic></topic><topic href="html/concepts/resources.html" label="Resources"></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 href="html/editor/xsleditor_contentassist.html#ed_XSLProposals" label="XSLT Element Proposals"></topic><topic href="html/editor/xsleditor_contentassist.html#SelectTest" label="Select, Test, and Match Attributes"></topic><topic href="html/editor/xsleditor_contentassist.html#ExcludeResultPrefixesContentAssist" label="Exclude-Result-Prefixes"></topic><topic href="html/editor/xsleditor_contentassist.html#ed_ModeAssist" label="Mode attribute assistance"></topic><topic href="html/editor/xsleditor_contentassist.html#ed_NamedTemplateAssist" label="Named Template Assistance"></topic><topic href="html/editor/xsleditor_contentassist.html#ed_CallTemplateAssist" label="Call-Template Assistance"></topic><topic href="html/editor/xsleditor_contentassist.html#ed_href" label="Include and Import href Assistance"></topic></topic><topic href="html/editor/xsleditor_templates.html" label="Templates"><topic href="html/editor/xsleditor_templates.html#N101CC" label="XPath Templates"></topic></topic><topic href="html/editor/xsleditor_coloring.html" label="XSLT Syntax Coloring"></topic><topic href="html/editor/xsleditor_markers.html" label="XSLT Markers and Annotations"><topic href="html/editor/xsleditor_markers.html#xsltOverRide" label="Template Override"></topic></topic><topic href="html/editor/xsleditor_debugging.html" label="XSL Debugging"></topic><topic href="html/editor/xsleditor_debugging.html" label="Navigation"></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/debugging.html" label="XSLT Debugging"><topic href="html/launching/debugging.html#N10251" label="Result View"></topic></topic></topic><topic href="html/preferences/xslpreferences.html" label="XSL Tools 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 href="html/preferences/validation.html" label="Project Validation Preferences"></topic><topic href="html/preferences/syntaxColoring.html" label="XSLT Syntax Coloring"></topic></topic><topic href="html/general/general.html" label="General"><topic href="html/general/general.html#XInclude" label="XInclude"></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 Tools"></topic><topic href="html/samples/samples.html#DITAEclipseHelp" label="Creating Eclipse Help with DITA and XSL Tools"></topic></topic></topic><topic href="html/legal.html" label="Notices"></topic></toc>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/.classpath b/docs/org.eclipse.wst.xsl.sdk.documentation/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/.project b/docs/org.eclipse.wst.xsl.sdk.documentation/.project
deleted file mode 100644
index 9fdf29d..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.sdk.documentation</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</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.sdk.documentation/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.xsl.sdk.documentation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2136ed3..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Sat Jun 21 18:22:30 GMT-05:00 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/docs/org.eclipse.wst.xsl.sdk.documentation/.settings/org.eclipse.wst.validation.prefs b/docs/org.eclipse.wst.xsl.sdk.documentation/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 879153b..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,17 +0,0 @@
-#Sat Aug 02 08:45:39 GMT-05:00 2008
-DELEGATES_PREFERENCE=delegateValidatorList
-USER_BUILD_PREFERENCE=enabledBuildValidatorList
-USER_MANUAL_PREFERENCE=enabledManualValidatorList
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.0.v200806051402
-eclipse.preferences.version=1
-override=true
-suspend=false
-vals/org.eclipse.jst.jsp.core.JSPBatchValidator/global=FF01
-vals/org.eclipse.jst.jsp.core.JSPContentValidator/global=FF01
-vals/org.eclipse.wst.dtd.core.dtdDTDValidator/global=FF01
-vals/org.eclipse.wst.html.ui.HTMLValidator/global=FF01
-vals/org.eclipse.wst.wsdl.validation.wsdl/global=FF02158org.eclipse.wst.wsdl.validation.internal.eclipse.Validator
-vals/org.eclipse.wst.xml.core.xml/global=TT03
-vals/org.eclipse.wst.xsd.core.xsd/global=FF02162org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator
-vals/org.eclipse.wst.xsl.core.xsl/global=TT02
-vf.version=3
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xsl.sdk.documentation/META-INF/MANIFEST.MF
deleted file mode 100644
index 4c1a268..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xsl.sdk.documentation; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.xsl.sdk.documentation.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.help
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %providerName
-Export-Package: org.eclipse.wst.xsl.sdk.documentation
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/about.html b/docs/org.eclipse.wst.xsl.sdk.documentation/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/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, 2008</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/docs/org.eclipse.wst.xsl.sdk.documentation/build.properties b/docs/org.eclipse.wst.xsl.sdk.documentation/build.properties
deleted file mode 100644
index 1ccfc96..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               build.xml,\
-               toc.xml,\
-               doc/html/,\
-               about.html,\
-               bin/,\
-               plugin.properties,\
-               tocExtension.xml
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/build.xml b/docs/org.eclipse.wst.xsl.sdk.documentation/build.xml
deleted file mode 100644
index 0353bac..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/build.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== 
-     Jul 21, 2008 6:46:02 PM                                                        
-
-     SDK Documentation    
-     Builds SDK TOC Documentation using JELDoclet.
-                   
-     dcarver                                                                
-     ====================================================================== -->
-<project name="SDK Documentation" default="default">
-    <description>
-            Builds SDK TOC Documentation using JELDoclet.
-    </description>
-	
-	<property name="workspace" location="."/>
-	<property name="workspaceloc" location=".."/>
-
-    <!-- ================================= 
-          target: default              
-         ================================= -->
-    <target name="default" description="Builds SDK TOC Documentation using JELDoclet.">
-
-  	  <javadoc destdir="doc" package="true" docletpath="${workspace}/lib/jeldoclet.jar">
-  	  	 <fileset dir="${workspaceloc}">
-	  	 	<include name="org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/*.java"/>
-	  	 	<include name="org.eclipse.wst.xsl.core/src/org/eclipse/wst/xsl/core/resolver/*.java"/>
-  	  	 	<include name="org.eclipse.wst.xsl.jaxp.debug/src-debugger/org/eclipse/wst/xsl/jaxp/debug/debugger/*.java"/>
-  	  	 	<include name="org.eclipse.wst.xsl.jaxp.debug/src-invoker/org/eclipse/wst/xsl/jaxp/debug/invoker/*.java"/>
-  	  	 	<include name="org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/*.java"/>
-  	  	 	<include name="org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/*.java"/>
-  	  	 	<include name="org.eclipse.wst.xml.xpath.core/src/org/eclipse/wst/xml/xpath/core/util/*.java"/>
-  	  	 	<include name="org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/*.java"/>
-  	  	 	<include name="org.eclipse.wst.xml.xpath.ui/src-xpath/org/eclipse/wst/xml/xpath/ui/views/*.java"/>
-  	  	 </fileset>
-  	     <doclet name="com.jeldoclet.JELDoclet"/>
-  	  </javadoc>
-    	
-     <xslt basedir="." style="doc/jeltohtml.xsl" in="doc/jel.xml" out="doc/html/deleteme.html">
-  		<factory name="org.apache.xalan.processor.TransformerFactoryImpl">
-  			<attribute name="http://xml.apache.org/xalan/features/optimize" value="true"/>
-  			
-  		</factory>
-     </xslt>
-    	
-    	
-     <xslt style="doc/jeltotoc.xsl" in="doc/jel.xml" out="toc.xml" destdir=".">
-  		<factory name="org.apache.xalan.processor.TransformerFactoryImpl">
-  			<attribute name="http://xml.apache.org/xalan/features/optimize" value="true"/>
-  		</factory>
-     	<param name="sdkname" expression="XSL Tools SDK Documentation"/>
-     </xslt>
-    	
-    </target>
-	
-	<target name="DocCheck">
-	  	  <javadoc destdir="doc/doccheck" package="true" docletpath="${workspace}/lib/doccheck.jar">
-	  	  	 <fileset dir="${workspaceloc}">
-	  	  	 	<include name="org.eclipse.wst.xsl.core/**/*.java"/>
-	  	  	 	<include name="org.eclipse.wst.xsl.debug/**/*.java"/>
-	  	  	 	<include name="org.eclipse.wst.xsl.debug.ui/**/*.java"/>
-	  	  	 	<include name="org.eclipse.wst.xsl.launching/**/*.java"/>
-	  	  	 	<include name="org.eclipse.wst.xsl.saxon/**/*.java"/>
-	  	  	 	<include name="org.eclipse.wst.xsl.ui/**/*.java"/>
-	  	  	 	<include name="org.eclipse.wst.xsl.xalan/src-debugger/**/*.java"/>
-	  	  	 	<include name="org.eclipse.wst.xml.xpath.core/src/**/*.java"/>
-	  	  	 	<include name="org.eclipse.wst.xml.xpath.ui/**/*.java"/>
-	  	  	 </fileset>
-	  	     <doclet name="com.sun.tools.doclets.doccheck.DocCheck">
-	  	     	<param name="-execDepth" value="2"/>
-	  	  	 </doclet>
-	  	  </javadoc>
-	</target>
-	
-	<target name="ExtensionPointDoc">
-		<pde.convertSchemaToHTML manifest="../org.eclipse.wst.xsl.jaxp.launching/plugin.xml"
-			                     destination="${workspace}/doc/html/extension_point"
-		/>
-	</target>
-
-</project>
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/.cvsignore b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/.cvsignore
deleted file mode 100644
index d68722e..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/.cvsignore
+++ /dev/null
@@ -1,299 +0,0 @@
-doccheck
-org.eclipse.wst.xsl.core.internal.parser.XSLSourceParser.xml
-org.eclipse.wst.xsl.internal.debug.ui.preferences.OutputPreferencePage.xml
-org.eclipse.wst.xml.xpath.ui.views.DOMViewerFilter.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.argument_return.xml
-org.eclipse.wst.xml.xpath.ui.internal.contentassist.XPathTemplateCompletionProcessor.xml
-org.eclipse.wst.xsl.core.internal.modelhandler.ModelHandlerForXSL.xml
-org.eclipse.wst.xsl.core.internal.XSLCorePlugin.xml
-org.eclipse.wst.xsl.ui.internal.XSLUIPlugin.xml
-org.eclipse.wst.xsl.internal.debug.ui.preferences.InstalledProcessorsBlock.xml
-org.eclipse.wst.xsl.internal.launching.XSLTSourceLookupParticipant.xml
-org.eclipse.wst.xsl.internal.launching.registry.DebuggerRegistry.xml
-org.eclipse.wst.xsl.core.internal.model.XSLAttribute.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.output.Messages.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.ParameterViewer.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.InstallStandin.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.variable_reference_return.xml
-org.eclipse.wst.xsl.core.internal.modelhandler.XSLModelLoader.xml
-org.eclipse.wst.xsl.ui.internal.actions.NewWizardAction.xml
-org.eclipse.wst.xsl.internal.debug.ui.model.XSLModelPresentation.xml
-org.eclipse.wst.xsl.core.resolver.XSLVersionHandler.xml
-org.eclipse.wst.xsl.internal.launching.DebuggerDescriptor.xml
-org.eclipse.wst.xsl.internal.launching.XSLTSourceLookupDirector.xml
-org.eclipse.wst.xsl.core.internal.encoding.XSLDocumentLoader.xml
-org.eclipse.wst.xsl.core.internal.text.IXSLPartitions.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.AddParameterAction.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.RemoveAction.xml
-org.eclipse.wst.xsl.core.internal.util.StructuredDocumentUtil.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.formatter.Messages.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.formatter.FOFormatterTab.xml
-org.eclipse.wst.xsl.ui.internal.contentassist.XSLContentAssistProcessor.xml
-org.eclipse.wst.xsl.ui.internal.wizards.NewXSLFileWizardPage.xml
-org.eclipse.wst.xsl.ui.internal.wizards.NewXSLFileTemplatesWizardPage.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.relative_location_path_return.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.formatter.XSLFOComboBlock.xml
-org.eclipse.wst.xsl.ui.internal.style.LineStyleProviderForXSL.xml
-org.eclipse.wst.xsl.launching.IProcessorType.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.XSLMainTab.xml
-org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.EditorReferenceLabelProvider.xml
-org.eclipse.wst.xsl.core.internal.parser.regions.XPathSeparatorRegion.xml
-org.eclipse.wst.xsl.core.internal.validation.XSLValidator.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.Messages.xml
-org.eclipse.wst.xsl.internal.launching.registry.InvokerRegistryReader.xml
-org.eclipse.wst.xsl.invoker.config.TypedValue.xml
-org.eclipse.wst.xsl.core.XSLCore.xml
-org.eclipse.wst.xsl.xalan.debugger.XalanRootStyleFrame.xml
-org.eclipse.wst.xsl.core.internal.validation.Messages.xml
-org.eclipse.wst.xml.xpath.ui.internal.preferences.XPathTemplatePreferencePage.xml
-org.eclipse.wst.xsl.ui.internal.editor.XSLHyperlinkDetector.xml
-org.eclipse.wst.xsl.launching.model.Messages.xml
-org.eclipse.wst.xsl.ui.internal.util.XSLPluginImages.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.path_expr_return.xml
-org.eclipse.wst.xsl.ui.internal.actions.NewXMLFileWizardDelegate.xml
-org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.RefreshAction.xml
-org.eclipse.wst.xsl.invoker.Messages.xml
-org.eclipse.wst.xsl.internal.launching.OutputPropertyPreferences.xml
-org.eclipse.wst.xsl.ui.internal.preferences.AbstractXSLPreferencePage.xml
-org.eclipse.wst.xsl.invoker.config.Messages.xml
-org.eclipse.wst.xsl.core.internal.regions.XSLParserRegionFactory.xml
-org.eclipse.wst.xml.xpath.internal.ui.views.JFaceNodeLabelProviderXPath.xml
-org.eclipse.wst.xsl.ui.internal.preferences.XSLTemplatePreferencePage.xml
-org.eclipse.wst.xsl.launching.model.XSLDebugElement.xml
-org.eclipse.wst.xsl.internal.launching.XSLTLaunchConfigurationDelegate.xml
-org.eclipse.wst.xsl.internal.debug.ui.preferences.Messages.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.union_expr_return.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.expr_return.xml
-org.eclipse.wst.xsl.ui.internal.actions.NewXSDFileWizardDelegate.xml
-org.eclipse.wst.xsl.internal.launching.registry.ProcessorTypeRegistryReader.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.equality_expr_return.xml
-org.eclipse.wst.xsl.core.internal.ant.XIncludeTask.xml
-org.eclipse.wst.xsl.internal.debug.ui.model.XSLBreakpointAdapterFactory.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.ProcessorDetailsDialog.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.filter_expr_return.xml
-org.eclipse.wst.xsl.ui.internal.XSLUIConstants.xml
-org.eclipse.wst.xsl.debug.internal.util.XSLDebugPluginImages.xml
-org.eclipse.wst.xml.xpath.ui.internal.contentassist.CustomTemplateProposal.xml
-org.eclipse.wst.xsl.internal.launching.registry.ProcessorRegistryReader.xml
-org.eclipse.wst.xsl.internal.debug.ui.XSLTTabGroup.xml
-org.eclipse.wst.xsl.internal.launching.registry.ProcessorRegistry.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.AddWorkspaceFileAction.xml
-org.eclipse.wst.xsl.internal.debug.ui.preferences.FeaturesBlock.xml
-org.eclipse.wst.xsl.core.internal.model.XSLElement.xml
-org.eclipse.wst.xsl.core.internal.model.StylesheetModel.xml
-org.eclipse.wst.xsl.core.internal.model.Import.xml
-org.eclipse.wst.xsl.ui.internal.preferences.MainPreferencePage.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.special_step_return.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.abbr_axis_specifier_return.xml
-org.eclipse.wst.xsl.invoker.TransformationException.xml
-org.eclipse.wst.xsl.internal.debug.ui.XSLLaunchShortcut.xml
-org.eclipse.wst.xsl.internal.debug.ui.preferences.AddProcessorDialog.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.XPathParserLexer.xml
-org.eclipse.wst.xml.xpath.internal.ui.views.XPathComputer.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.function_call_return.xml
-org.eclipse.wst.xml.xpath.ui.internal.XPathUIMessages.xml
-org.eclipse.wst.xsl.xalan.debugger.XalanPrintTraceListener.xml
-org.eclipse.wst.xsl.internal.launching.Utils.xml
-org.eclipse.wst.xsl.core.internal.model.Include.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.absolute_location_path_return.xml
-org.eclipse.wst.xsl.core.internal.validation.MaxErrorsExceededException.xml
-org.eclipse.wst.xml.xpath.internal.ui.views.XPathView.xml
-org.eclipse.wst.xml.xpath.ui.XPathUIMessages.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.output.OutputFileBlock.xml
-org.eclipse.wst.xsl.internal.launching.ProcessorInvokerDescriptor.xml
-org.eclipse.wst.xml.xpath.ui.internal.util.XPathPluginImageHelper.xml
-org.eclipse.wst.xsl.launching.model.XSLDebugTarget.xml
-org.eclipse.wst.xsl.invoker.IProcessorInvoker.xml
-org.eclipse.wst.xsl.core.internal.model.Variable.xml
-org.eclipse.wst.xsl.internal.debug.ui.AbstractTableBlock.xml
-org.eclipse.wst.xsl.core.internal.model.Stylesheet.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.ProcessorMessages.xml
-org.eclipse.wst.xsl.invoker.config.PipelineDefinition.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.IParametersChangedListener.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.output.OutputTab.xml
-org.eclipse.wst.xsl.invoker.config.CreationException.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.ProcessorDescriptor.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.MultipleInputDialog.FieldSummary.xml
-org.eclipse.wst.xsl.internal.launching.registry.DebuggerRegistryReader.xml
-org.eclipse.wst.xsl.internal.debug.ui.preferences.ProcessorsPreferencePage.xml
-org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIPlugin.xml
-org.eclipse.wst.xml.xpath.internal.ui.views.JFaceNodeContentProviderXPath.xml
-org.eclipse.wst.xsl.ui.internal.validation.DelegatingSourceValidatorForXSL.xml
-org.eclipse.wst.xsl.ui.internal.actions.NewWSDLFileWizardDelegate.xml
-org.eclipse.wst.xml.xpath.ui.internal.util.XPathPluginImages.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.literal_return.xml
-org.eclipse.wst.xsl.core.ValidationPreferences.xml
-org.eclipse.wst.xsl.xalan.debugger.XalanTraceListener.xml
-org.eclipse.wst.xsl.ui.internal.actions.NewXSLFileWizardDelegate.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.AbstractStylesheetAction.xml
-org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XPathAction.xml
-org.eclipse.wst.xsl.ui.internal.actions.NewDTDFileWizardDelegate.xml
-org.eclipse.wst.xsl.ui.internal.doubleclick.XSLDoubleClickStrategy.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.relational_expr_return.xml
-org.eclipse.wst.xsl.core.internal.validation.XSLValidationMessage.xml
-org.eclipse.wst.xml.xpath.ui.internal.preferences.XPathPrefencePage.xml
-org.eclipse.wst.xsl.core.internal.validation.eclipse.Validator2.xml
-org.eclipse.wst.xsl.launching.IProcessorInstall.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.MainTabMessages.xml
-org.eclipse.wst.xsl.core.internal.model.XSLNode.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetLabelProvider.xml
-org.eclipse.wst.xsl.ui.internal.contentassist.Messages.xml
-org.eclipse.wst.xsl.launching.config.LaunchProperties.xml
-org.eclipse.wst.xsl.core.internal.util.Debug.xml
-org.eclipse.wst.xml.xpath.ui.views.EditNamespacePrefixDialog.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.JarLabelProvider.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.ParametersContentProvider.xml
-jel.xml
-org.eclipse.wst.xml.xpath.core.XPathCorePlugin.xml
-org.eclipse.wst.xsl.internal.launching.PluginProcessorJar.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.primary_expr_return.xml
-org.eclipse.wst.xsl.internal.launching.XSLPropertyTester.xml
-org.eclipse.wst.xsl.internal.debug.ui.ResourceSelectionBlock.WidgetListener.xml
-org.eclipse.wst.xsl.xalan.debugger.XalanVariable.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.number_return.xml
-org.eclipse.wst.xsl.ui.internal.validation.XSLMarkupValidator.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.xml
-org.eclipse.wst.xsl.internal.debug.ui.breakpoint.Messages.xml
-org.eclipse.wst.xsl.ui.internal.validation.DelegatingSourceValidatorForXalanXSL.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.formatter.RendererTabMessages.xml
-org.eclipse.wst.xsl.internal.debug.ui.XSLConsoleLineTracker.xml
-org.eclipse.wst.xsl.launching.IProcessorInvoker.xml
-org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.ShowInSourceAction.xml
-org.eclipse.wst.xsl.internal.debug.ui.XSLLaunchConfigurationTab.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.formatter.RendererConfigurationBlock.xml
-org.eclipse.wst.xsl.internal.launching.registry.Messages.xml
-org.eclipse.wst.xsl.debugger.StyleFrame.xml
-org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.InputFileBlock.xml
-org.eclipse.wst.xsl.debugger.IXSLDebugger.xml
-org.eclipse.wst.xsl.launching.IFeature.xml
-org.eclipse.wst.xsl.internal.debug.ui.model.XSLLineBreakpointAdapter.xml
-org.eclipse.wst.xsl.ui.internal.preferences.Messages.xml
-org.eclipse.wst.xsl.internal.launching.ProcessorPreferences.xml
-org.eclipse.wst.xsl.internal.launching.PreferenceInitializer.xml
-org.eclipse.wst.xsl.debugger.DebugRunner.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.i_relative_location_path_return.xml
-org.eclipse.wst.xsl.launching.config.Messages.xml
-org.eclipse.wst.xsl.core.internal.util.FileUtil.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.XSLProcessorTab.xml
-org.eclipse.wst.xml.xpath.core.internal.parser.XPathParser.xml
-org.eclipse.wst.xsl.internal.debug.ui.preferences.ProcessorLibraryBlock.xml
-org.eclipse.wst.xsl.core.internal.model.Parameter.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.resolver.URIResolverBlock2.xml
-org.eclipse.wst.xsl.core.internal.preferences.PreferenceInitializer.xml
-org.eclipse.wst.xsl.xalan.debugger.XalanStyleFrame.xml
-org.eclipse.wst.xsl.launching.model.XSLLineBreakpoint.xml
-org.eclipse.wst.xml.xpath.ui.internal.templates.TemplateContextTypeIdsXPath.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.resolver.Messages.xml
-org.eclipse.wst.xsl.internal.launching.registry.AbstractRegistryReader.xml
-org.eclipse.wst.xsl.internal.launching.LaunchingPlugin.xml
-org.eclipse.wst.xsl.ui.internal.templates.VersionTemplateVariableResolverXSL.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.xpath_return.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.FeaturesBlock.xml
-org.eclipse.wst.xsl.invoker.ConfigurationException.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.RemoveParameterAction.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.MultipleInputDialog.xml
-org.eclipse.wst.xsl.launching.Messages.xml
-org.eclipse.wst.xsl.ui.internal.wizards.NewXSLFileWizard.xml
-org.eclipse.wst.xsl.launching.model.IXSLDebugTarget.xml
-org.eclipse.wst.xsl.core.internal.Messages.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.TransformsBlock.xml
-org.eclipse.wst.xsl.invoker.JAXPSAXProcessorInvoker.xml
-org.eclipse.wst.xsl.internal.launching.OutputProperty.xml
-org.eclipse.wst.xsl.core.internal.regions.XPathRegionContext.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.ControlAccessibleListener.xml
-org.eclipse.wst.xsl.ui.internal.util.XSLPluginImageHelper.xml
-org.eclipse.wst.xsl.launching.XSLLaunchConfigurationConstants.xml
-org.eclipse.wst.xsl.internal.launching.Messages.xml
-org.eclipse.wst.xsl.internal.debug.ui.preferences.OutputBlock.xml
-org.eclipse.wst.xsl.launching.config.LaunchTransform.xml
-org.eclipse.wst.xsl.debugger.DebugConstants.xml
-org.eclipse.wst.xsl.core.internal.validation.eclipse.Validator.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.abbr_step_return.xml
-org.eclipse.wst.xsl.launching.config.LaunchAttribute.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.location_path_return.xml
-org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XMLEditorsContentProvider.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetViewer.xml
-org.eclipse.wst.xsl.debugger.Variable.xml
-org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.resolver.WorkingDirectoryBlock.xml
-org.eclipse.wst.xsl.core.internal.model.CallTemplate.xml
-org.eclipse.wst.xsl.core.resolver.ResolverExtension.xml
-org.eclipse.wst.xsl.ui.internal.StructuredTextViewerConfigurationXSL.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.ParametersBlock.xml
-org.eclipse.wst.xml.xpath.ui.XPathViewPlugin.xml
-org.eclipse.wst.xsl.internal.launching.PreferenceUtil.xml
-org.eclipse.wst.xsl.launching.model.IXSLConstants.xml
-org.eclipse.wst.xsl.launching.IDebugger.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.ParametersLabelProvider.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.mult_expr_return.xml
-org.eclipse.wst.xsl.internal.launching.FeaturePreferences.xml
-org.eclipse.wst.xsl.launching.IOutputProperty.xml
-org.eclipse.wst.xsl.launching.model.XSLThread.xml
-org.eclipse.wst.xsl.xalan.debugger.XalanDebugger.xml
-org.eclipse.wst.xsl.core.internal.validation.XSLValidationReport.xml
-org.eclipse.wst.xsl.launching.config.LaunchFeatures.xml
-org.eclipse.wst.xsl.internal.debug.ui.preferences.FeaturesPreferencePage.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.IStylesheetEntriesChangedListener.xml
-org.eclipse.wst.xml.xpath.ui.views.DOMNodeLabelProvider.xml
-org.eclipse.wst.xsl.internal.launching.ProcessorType.xml
-org.eclipse.wst.xsl.ui.internal.validation.XSLErrorListener.xml
-org.eclipse.wst.xsl.core.internal.ant.Messages.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.resolver.URIResolverBlock.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.AbstractParameterAction.xml
-org.eclipse.wst.xsl.launching.config.LaunchHelper.xml
-org.eclipse.wst.xsl.ui.internal.editor.SourceFileHyperlink.xml
-org.eclipse.wst.xsl.launching.model.XSLVariable.xml
-org.eclipse.wst.xsl.launching.model.XSLValue.xml
-org.eclipse.wst.xsl.launching.model.XSLStackFrame.xml
-org.eclipse.wst.xsl.core.internal.model.Template.xml
-org.eclipse.wst.xsl.internal.debug.ui.preferences.BasePreferencePage.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.predicate_expr_return.xml
-org.eclipse.wst.xsl.internal.launching.registry.ProcessorTypeRegistry.xml
-org.eclipse.wst.xsl.core.internal.xinclude.XIncluder.xml
-org.eclipse.wst.xml.xpath.ui.views.DOMTreeContentProvider.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.output.OutputPropertiesBlock.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.unary_expr_return.xml
-org.eclipse.wst.xsl.internal.launching.registry.InvokerRegistry.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.MoveUpAction.xml
-org.eclipse.wst.xsl.invoker.config.TransformDefinition.xml
-org.eclipse.wst.xsl.ui.internal.templates.TemplateContextTypeXSL.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.OpenDialogAction.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.additive_expr_return.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.step_return.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.arg_list_return.xml
-org.eclipse.wst.xsl.debug.internal.util.XSLPluginImageHelper.xml
-org.eclipse.wst.xsl.internal.debug.ui.Messages.xml
-org.eclipse.wst.xsl.ui.internal.perspective.XMLPerspectiveFactory.xml
-org.eclipse.wst.xsl.ui.internal.handlers.OpenDeclarationHandler.xml
-org.eclipse.wst.xsl.launching.config.LaunchPipeline.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.AddExternalFileAction.xml
-org.eclipse.wst.xsl.internal.launching.ProcessorJar.xml
-org.eclipse.wst.xsl.launching.XSLTRuntime.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.main.StylesheetContentProvider.xml
-org.eclipse.wst.xsl.core.internal.text.rules.StructuredTextPartitionerForXSL.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathLexer.xml
-org.eclipse.wst.xsl.core.internal.model.StylesheetBuilder.xml
-org.eclipse.wst.xsl.internal.debug.ui.ResourceSelectionBlock.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.JarContentProvider.xml
-org.eclipse.wst.xsl.debugger.AbstractDebugger.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.ActionMessages.xml
-org.eclipse.wst.xsl.internal.launching.XSLTSourcePathComputerDelegate.xml
-org.eclipse.wst.xsl.internal.debug.ui.breakpoint.XSLBreakpointProvider.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.MoveDownAction.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.ProcessorBlock.xml
-org.eclipse.wst.xsl.internal.debug.ui.tabs.processor.Messages.xml
-org.eclipse.wst.xml.xpath.internal.ui.views.Messages.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.predicate_return.xml
-org.eclipse.wst.xml.xpath.internal.ui.views.XPathViewActions.xml
-org.eclipse.wst.xsl.ui.internal.preferences.ValidationPreferencePage.xml
-org.eclipse.wst.xsl.launching.IProcessorJar.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.or_expr_return.xml
-org.eclipse.wst.xsl.internal.debug.ui.actions.MultipleInputDialog.Validator.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.axis_return.xml
-org.eclipse.wst.xsl.internal.debug.ui.XSLDebugUIConstants.xml
-org.eclipse.wst.xsl.internal.launching.Feature.xml
-org.eclipse.wst.xsl.debugger.BreakPoint.xml
-org.eclipse.wst.xsl.launching.ProcessorInstall.xml
-org.eclipse.wst.xsl.core.internal.xpath.parser.xpathParser.and_expr_return.xml
-org.eclipse.wst.xsl.invoker.Main.xml
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/.cvsignore b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/.cvsignore
deleted file mode 100644
index 175a2a6..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-deleteme.html
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_debugger.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_debugger.html
deleted file mode 100644
index 885c8c2..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_debugger.html
+++ /dev/null
@@ -1,61 +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>XSLT Debugger</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">XSLT Debugger</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.xsl.launching.jaxp.debugger<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>Contribute a debugger for a particular JAXP processor type (e.g. Saxon). The extension point primarily defines the classpath and transformer factory to be used when debugging.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.debugger">debugger</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.debugger">debugger</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST debugger</p>
-<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">classpath&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">processorTypeId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">className&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">transformerFactoryClass&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-A debugger for a processor type</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - A unique id for this debugger</li>
-<li><b>name</b> - A name to be displayed in the UI</li>
-<li><b>classpath</b> - A ';'-separated classpath required to run the debugger (in addition to that already added by the processor itself).</li>
-<li><b>processorTypeId</b> - The processor type that this debugger works with</li>
-<li><b>className</b> - A fully-qualified class that implement the IXSLDebugger interface. It is easier to extend AbstractXSLDebugger.</li>
-<li><b>transformerFactoryClass</b> - The fully-qualified class name of the transformer factory to use for debugging. This must be one of the transformer factories belonging to the processor type.</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
-   &lt;extension
-         point=</span><span class="code SchemaCstring">&quot;org.eclipse.wst.xsl.jaxp.launching.debugger&quot;</span><span class="code SchemaTag">&gt;
-      &lt;debugger
-            className=</span><span class="code SchemaCstring">&quot;org.eclipse.wst.xsl.xalan.debugger.XalanDebugger&quot;</span><span class="code SchemaTag">
-            classpath=</span><span class="code SchemaCstring">&quot;${eclipse_orbit:org.eclipse.wst.xsl.xalan}&quot;</span><span class="code SchemaTag">
-            id=</span><span class="code SchemaCstring">&quot;org.eclipse.wst.xsl.xalan.debugger&quot;</span><span class="code SchemaTag">
-            name=</span><span class="code SchemaCstring">&quot;Xalan 2.5.1 or greater&quot;</span><span class="code SchemaTag">
-            processorTypeId=</span><span class="code SchemaCstring">&quot;org.eclipse.wst.xsl.xalan.processorType&quot;</span><span class="code SchemaTag">
-            transformerFactoryClass=</span><span class="code SchemaCstring">&quot;org.apache.xalan.processor.TransformerFactoryImpl&quot;</span><span class="code SchemaTag">&gt;
-      &lt;/debugger&gt;
-   &lt;/extension&gt;
-</span></pre>
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2007 Chase Technology Ltd - <a href="http://www.chasetechnology.co.uk">http://www.chasetechnology.co.uk</a>.<br>
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
-
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_invoke.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_invoke.html
deleted file mode 100644
index 6deb4d1..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_invoke.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>XSLT Processor Invoker</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">XSLT Processor Invoker</H1>
-<div style="border: 1px solid #990000; padding: 5px; text-align: center; color: red;">This extension point is internal</div>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.xsl.launching.jaxp.invoke<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6><b>This extension point is internal and should not be used by any other plugins.</b><p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.invoker">invoker</a>)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.invoker">invoker</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST invoker</p>
-<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">classpath&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - Unique id for this invoker</li>
-<li><b>class</b> - A class that implements the IProcessorInvoker interface</li>
-<li><b>classpath</b> - 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.</li>
-</ul>
-<br><br>
-<p class="note SchemaCopyright">
-Copyright (c) 2007 Chase Technology Ltd - <a href="http://www.chasetechnology.co.uk">http://www.chasetechnology.co.uk</a>.<br>
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
-
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_processor.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_processor.html
deleted file mode 100644
index 6dee1a4..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_processor.html
+++ /dev/null
@@ -1,63 +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>XSLT Processor</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">XSLT Processor</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.xsl.launching.jaxp.processor<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>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.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.processor">processor</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.processor">processor</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST processor</p>
-<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">label&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">processorTypeId&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">classpath&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">debuggerId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class="code SchemaDtdAttlist">supports&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-An instance of a JAXP-compliant XSLT processor</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - A unique id for this processor instance</li>
-<li><b>label</b> - A label for this instance to be displayed in the UI</li>
-<li><b>processorTypeId</b> - The id for the processor type</li>
-<li><b>classpath</b> - The classpath to use when this processor is launched</li>
-<li><b>debuggerId</b> - The id of a debugger to associate with the processor</li>
-<li><b>supports</b> - A comma-separated list of supported XSLT versions e.g. 1.0,2.0</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
-   &lt;extension
-         point=</span><span class="code SchemaCstring">&quot;org.eclipse.wst.xsl.jaxp.launching.processor&quot;</span><span class="code SchemaTag">&gt;
-      &lt;!-- An adopter can specify the ${eclipse_orbit: } variable to indicate which eclipse
-           bundle should be added to the class path. --&gt;
-      &lt;processor
-      classpath=</span><span class="code SchemaCstring">&quot;${eclipse_orbit:org.apache.xalan};${eclipse_orbit:org.apache.xml.serializer};${eclipse_orbit:org.apache.bcel};${eclipse_orbit:java_cup.runtime}&quot;</span><span class="code SchemaTag">
-            id=</span><span class="code SchemaCstring">&quot;org.eclipse.wst.xsl.launching.xalan.processor&quot;</span><span class="code SchemaTag">
-            label=</span><span class="code SchemaCstring">&quot;%processor.label.1&quot;</span><span class="code SchemaTag">
-            processorTypeId=</span><span class="code SchemaCstring">&quot;org.eclipse.wst.xsl.xalan.processorType&quot;</span><span class="code SchemaTag">
-            debuggerId=</span><span class="code SchemaCstring">&quot;org.eclipse.wst.xsl.xalan.debugger&quot;</span><span class="code SchemaTag">
-            supports=</span><span class="code SchemaCstring">&quot;1.0&quot;</span><span class="code SchemaTag">&gt;
-      &lt;/processor&gt;
-   &lt;/extension&gt;
-</span></pre>
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2007 Chase Technology Ltd - <a href="http://www.chasetechnology.co.uk">http://www.chasetechnology.co.uk</a>.<br>
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
-
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_processorType.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_processorType.html
deleted file mode 100644
index 2b8140f..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_processorType.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>XSLT Processor Type</title>
-<style type="text/css">@import url("../../book.css");</style>
-<style type="text/css">@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1 style="text-align:center">XSLT Processor Type</H1>
-<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.xsl.launching.jaxp.processorType<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>Contribute a Java XSLT processor type (e.g. Xalan, Saxon). The processor type defines which JAXP attributes and output properies are supported, and also the transformer factory classes it contains.<p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
-<p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.processorType">processorType</a>+)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
-<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.processorType">processorType</a> (<a href="#e.transformerFactory">transformerFactory</a>*)&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST processorType</p>
-<p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">label&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">outputProperties&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class="code SchemaDtdAttlist">attributeProperties&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>id</b> - Unique id for the processor type</li>
-<li><b>label</b> - Name for display in the UI</li>
-<li><b>outputProperties</b> - Location of a properties file containing the list of the processors output properties. Must be a path relative to the root of the bundle.</li>
-<li><b>attributeProperties</b> - Location of a properties file containing the list of the attributes supported by this processor. Must be a path relative to the root of the bundle.</li>
-</ul>
-<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.transformerFactory">transformerFactory</a> EMPTY&gt;</p>
-<p class="code SchemaDtd">&lt;!ATTLIST transformerFactory</p>
-<p class="code SchemaDtdAttlist">factoryClass&nbsp;CDATA #REQUIRED<p class="code SchemaDtdAttlist">name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
-<p></p>
-<p class="ConfigMarkupElementDesc">
-A TransformerFactory for this type</p>
-<br>
-<ul class="ConfigMarkupAttlistDesc">
-<li><b>factoryClass</b> - The fully-qualified transformer factory class</li>
-<li><b>name</b> - A name for this transformer factory to be displayed in the UI</li>
-</ul>
-<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6><pre class="Example"><span class="code SchemaTag">
-   &lt;extension
-         point=</span><span class="code SchemaCstring">&quot;org.eclipse.wst.xsl.jaxp.launching.processorType&quot;</span><span class="code SchemaTag">&gt;
-      &lt;processorType
-            attributeProperties=</span><span class="code SchemaCstring">&quot;XalanAttributes.properties&quot;</span><span class="code SchemaTag">
-            id=</span><span class="code SchemaCstring">&quot;org.eclipse.wst.xsl.xalan.processorType&quot;</span><span class="code SchemaTag">
-            label=</span><span class="code SchemaCstring">&quot;%processorType.label.0&quot;</span><span class="code SchemaTag">
-            outputProperties=</span><span class="code SchemaCstring">&quot;XalanOutputProperties.properties&quot;</span><span class="code SchemaTag">&gt;
-         &lt;transformerFactory
-               factoryClass=</span><span class="code SchemaCstring">&quot;org.apache.xalan.processor.TransformerFactoryImpl&quot;</span><span class="code SchemaTag">
-               name=</span><span class="code SchemaCstring">&quot;Interpretive&quot;</span><span class="code SchemaTag">&gt;
-         &lt;/transformerFactory&gt;
-         &lt;transformerFactory
-               factoryClass=</span><span class="code SchemaCstring">&quot;org.apache.xalan.xsltc.trax.TransformerFactoryImpl&quot;</span><span class="code SchemaTag">
-               name=</span><span class="code SchemaCstring">&quot;Compiling&quot;</span><span class="code SchemaTag">&gt;
-         &lt;/transformerFactory&gt;
-      &lt;/processorType&gt;
-   &lt;/extension&gt;
-</span></pre>
-<p></p>
-
-<br>
-<p class="note SchemaCopyright">
-Copyright (c) 2007 Chase Technology Ltd - <a href="http://www.chasetechnology.co.uk">http://www.chasetechnology.co.uk</a>.<br>
-All rights reserved. This program and the accompanying materials are made 
-available under the terms of the Eclipse Public License v1.0 which accompanies 
-this distribution, and is available at <a
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>
-
-</p>
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.core.XPathCorePlugin.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.core.XPathCorePlugin.html
deleted file mode 100644
index e4b81ed..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.core.XPathCorePlugin.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.core</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.core</strong></font><br>
-               Class XPathCorePlugin</h2><br><hr><pre>public class <strong>XPathCorePlugin</strong>
-extends Plugin</pre>The activator class controls the plug-in life cycle<hr><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Field Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_PLUGIN_ID">PLUGIN_ID</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><br><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XPathCorePlugin">XPathCorePlugin</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public static org.eclipse.wst.xml.xpath.core.XPathCorePlugin</code></td><td width="" align="left"><code><a href="#method_getDefault">getDefault</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Returns the shared instance</td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_start">start</a>(BundleContext context)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_stop">stop</a>(BundleContext context)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Field Detail
-               </h2></td></tr></table><h2><a name="field_PLUGIN_ID">PLUGIN_ID</a></h2><p><code>public static  java.lang.String <strong>PLUGIN_ID</strong></code></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XPathCorePlugin">XPathCorePlugin</a></h2><p><code>public <strong>XPathCorePlugin</strong>()</code></p><p>The constructor</p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_getDefault">getDefault</a></h2><p><code>public org.eclipse.wst.xml.xpath.core.XPathCorePlugin <strong>getDefault</strong>()</code></p><p>Returns the shared instance</p><h3>Returns</h3><p><code>org.eclipse.wst.xml.xpath.core.XPathCorePlugin</code> - the shared instance</p><hr><h2><a name="method_start">start</a></h2><p><code>public void <strong>start</strong>(BundleContext context)</code></p><p></p><h3>Parameters</h3><p><code>context</code></p><h3>Throws:</h3><p><code>java.lang.Exception</code></p><hr><h2><a name="method_stop">stop</a></h2><p><code>public void <strong>stop</strong>(BundleContext context)</code></p><p></p><h3>Parameters</h3><p><code>context</code></p><h3>Throws:</h3><p><code>java.lang.Exception</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper.html
deleted file mode 100644
index 548a7c7..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.core.util</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.core.util</strong></font><br>
-               Class XSLTXPathHelper</h2><br><hr><pre>public class <strong>XSLTXPathHelper</strong>
-extends java.lang.Object</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XSLTXPathHelper">XSLTXPathHelper</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public static void</code></td><td width="" align="left"><code><a href="#method_compile">compile</a>(java.lang.String expression)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static XObject</code></td><td width="" align="left"><code><a href="#method_eval">eval</a>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Evaluate XPath string to an XObject. Using this method, XPath namespace
- prefixes will be resolved from the namespaceNode.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static XObject</code></td><td width="" align="left"><code><a href="#method_eval">eval</a>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str
-         ,
-      org.w3c.dom.Node namespaceNode)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Evaluate XPath string to an XObject. XPath namespace prefixes are
- resolved from the namespaceNode. The implementation of this is a little
- slow, since it creates a number of objects each time it is called. This
- could be optimized to keep the same objects around, but then
- thread-safety issues would arise.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static XObject</code></td><td width="" align="left"><code><a href="#method_eval">eval</a>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str
-         ,
-      PrefixResolver prefixResolver)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Evaluate XPath string to an XObject. XPath namespace prefixes are
- resolved from the namespaceNode. The implementation of this is a little
- slow, since it creates a number of objects each time it is called. This
- could be optimized to keep the same objects around, but then
- thread-safety issues would arise.</td></tr><tr valign="top"><td width="20%" align="right"><code>protected static FunctionTable</code></td><td width="" align="left"><code><a href="#method_getFunctionTable">getFunctionTable</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static org.w3c.dom.traversal.NodeIterator</code></td><td width="" align="left"><code><a href="#method_selectNodeIterator">selectNodeIterator</a>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Use an XPath string to select a nodelist. XPath namespace prefixes are
- resolved from the contextNode.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static org.w3c.dom.traversal.NodeIterator</code></td><td width="" align="left"><code><a href="#method_selectNodeIterator">selectNodeIterator</a>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str
-         ,
-      org.w3c.dom.Node namespaceNode)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Use an XPath string to select a nodelist. XPath namespace prefixes are
- resolved from the namespaceNode.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static org.w3c.dom.NodeList</code></td><td width="" align="left"><code><a href="#method_selectNodeList">selectNodeList</a>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Use an XPath string to select a nodelist. XPath namespace prefixes are
- resolved from the contextNode.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static org.w3c.dom.NodeList</code></td><td width="" align="left"><code><a href="#method_selectNodeList">selectNodeList</a>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str
-         ,
-      org.w3c.dom.Node namespaceNode)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Use an XPath string to select a nodelist. XPath namespace prefixes are
- resolved from the namespaceNode.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static org.w3c.dom.Node</code></td><td width="" align="left"><code><a href="#method_selectSingleNode">selectSingleNode</a>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Use an XPath string to select a single node. XPath namespace prefixes are
- resolved from the context node, which may not be what you want (see the
- next method).</td></tr><tr valign="top"><td width="20%" align="right"><code>public static org.w3c.dom.Node</code></td><td width="" align="left"><code><a href="#method_selectSingleNode">selectSingleNode</a>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str
-         ,
-      org.w3c.dom.Node namespaceNode)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Use an XPath string to select a single node. XPath namespace prefixes are
- resolved from the namespaceNode.</td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XSLTXPathHelper">XSLTXPathHelper</a></h2><p><code>public <strong>XSLTXPathHelper</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_compile">compile</a></h2><p><code>public void <strong>compile</strong>(java.lang.String expression)</code></p><p></p><h3>Parameters</h3><p><code>expression</code></p><h3>Throws:</h3><p><code>javax.xml.xpath.XPathExpressionException</code></p><hr><h2><a name="method_eval">eval</a></h2><p><code>public XObject <strong>eval</strong>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str)</code></p><p>Evaluate XPath string to an XObject. Using this method, XPath namespace
- prefixes will be resolved from the namespaceNode.</p><h3>Parameters</h3><p><code>contextNode</code> - The node to start searching from.</p><p><code>str</code> - A valid XPath string.</p><h3>Returns</h3><p><code>XObject</code> - An XObject, which can be used to obtain a string, number,          nodelist, etc, should never be null.</p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_eval">eval</a></h2><p><code>public XObject <strong>eval</strong>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str
-         ,
-      org.w3c.dom.Node namespaceNode)</code></p><p>Evaluate XPath string to an XObject. XPath namespace prefixes are
- resolved from the namespaceNode. The implementation of this is a little
- slow, since it creates a number of objects each time it is called. This
- could be optimized to keep the same objects around, but then
- thread-safety issues would arise.</p><h3>Parameters</h3><p><code>contextNode</code> - The node to start searching from.</p><p><code>str</code> - A valid XPath string.</p><p><code>namespaceNode</code> - The node from which prefixes in the XPath will be resolved to             namespaces.</p><h3>Returns</h3><p><code>XObject</code> - An XObject, which can be used to obtain a string, number,          nodelist, etc, should never be null.</p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_eval">eval</a></h2><p><code>public XObject <strong>eval</strong>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str
-         ,
-      PrefixResolver prefixResolver)</code></p><p>Evaluate XPath string to an XObject. XPath namespace prefixes are
- resolved from the namespaceNode. The implementation of this is a little
- slow, since it creates a number of objects each time it is called. This
- could be optimized to keep the same objects around, but then
- thread-safety issues would arise.</p><h3>Parameters</h3><p><code>contextNode</code> - The node to start searching from.</p><p><code>str</code> - A valid XPath string.</p><p><code>prefixResolver</code> - Will be called if the parser encounters namespace prefixes, to             resolve the prefixes to URLs.</p><h3>Returns</h3><p><code>XObject</code> - An XObject, which can be used to obtain a string, number,          nodelist, etc, should never be null.</p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_getFunctionTable">getFunctionTable</a></h2><p><code>protected FunctionTable <strong>getFunctionTable</strong>()</code></p><p></p><h3>Returns</h3><p><code>FunctionTable</code></p><hr><h2><a name="method_selectNodeIterator">selectNodeIterator</a></h2><p><code>public org.w3c.dom.traversal.NodeIterator <strong>selectNodeIterator</strong>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str)</code></p><p>Use an XPath string to select a nodelist. XPath namespace prefixes are
- resolved from the contextNode.</p><h3>Parameters</h3><p><code>contextNode</code> - The node to start searching from.</p><p><code>str</code> - A valid XPath string.</p><h3>Returns</h3><p><code>org.w3c.dom.traversal.NodeIterator</code> - A NodeIterator, should never be null.</p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_selectNodeIterator">selectNodeIterator</a></h2><p><code>public org.w3c.dom.traversal.NodeIterator <strong>selectNodeIterator</strong>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str
-         ,
-      org.w3c.dom.Node namespaceNode)</code></p><p>Use an XPath string to select a nodelist. XPath namespace prefixes are
- resolved from the namespaceNode.</p><h3>Parameters</h3><p><code>contextNode</code> - The node to start searching from.</p><p><code>str</code> - A valid XPath string.</p><p><code>namespaceNode</code> - The node from which prefixes in the XPath will be resolved to             namespaces.</p><h3>Returns</h3><p><code>org.w3c.dom.traversal.NodeIterator</code> - A NodeIterator, should never be null.</p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_selectNodeList">selectNodeList</a></h2><p><code>public org.w3c.dom.NodeList <strong>selectNodeList</strong>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str)</code></p><p>Use an XPath string to select a nodelist. XPath namespace prefixes are
- resolved from the contextNode.</p><h3>Parameters</h3><p><code>contextNode</code> - The node to start searching from.</p><p><code>str</code> - A valid XPath string.</p><h3>Returns</h3><p><code>org.w3c.dom.NodeList</code> - A NodeIterator, should never be null.</p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_selectNodeList">selectNodeList</a></h2><p><code>public org.w3c.dom.NodeList <strong>selectNodeList</strong>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str
-         ,
-      org.w3c.dom.Node namespaceNode)</code></p><p>Use an XPath string to select a nodelist. XPath namespace prefixes are
- resolved from the namespaceNode.</p><h3>Parameters</h3><p><code>contextNode</code> - The node to start searching from.</p><p><code>str</code> - A valid XPath string.</p><p><code>namespaceNode</code> - The node from which prefixes in the XPath will be resolved to             namespaces.</p><h3>Returns</h3><p><code>org.w3c.dom.NodeList</code> - A NodeIterator, should never be null.</p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_selectSingleNode">selectSingleNode</a></h2><p><code>public org.w3c.dom.Node <strong>selectSingleNode</strong>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str)</code></p><p>Use an XPath string to select a single node. XPath namespace prefixes are
- resolved from the context node, which may not be what you want (see the
- next method).</p><h3>Parameters</h3><p><code>contextNode</code> - The node to start searching from.</p><p><code>str</code> - A valid XPath string.</p><h3>Returns</h3><p><code>org.w3c.dom.Node</code> - The first node found that matches the XPath, or null.</p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_selectSingleNode">selectSingleNode</a></h2><p><code>public org.w3c.dom.Node <strong>selectSingleNode</strong>(org.w3c.dom.Node contextNode
-         ,
-      java.lang.String str
-         ,
-      org.w3c.dom.Node namespaceNode)</code></p><p>Use an XPath string to select a single node. XPath namespace prefixes are
- resolved from the namespaceNode.</p><h3>Parameters</h3><p><code>contextNode</code> - The node to start searching from.</p><p><code>str</code> - A valid XPath string.</p><p><code>namespaceNode</code> - The node from which prefixes in the XPath will be resolved to             namespaces.</p><h3>Returns</h3><p><code>org.w3c.dom.Node</code> - The first node found that matches the XPath, or null.</p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.XPathUIMessages.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.XPathUIMessages.html
deleted file mode 100644
index a921231..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.XPathUIMessages.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui</strong></font><br>
-               Class XPathUIMessages</h2><br><hr><pre>public class <strong>XPathUIMessages</strong>
-extends NLS</pre>Strings used by XPath UI<hr><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Field Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Context">XPathNavigator_Context</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Document">XPathNavigator_Document</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_DOM_Tree">XPathNavigator_DOM_Tree</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Expression">XPathNavigator_Expression</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Namespace_Prefixes">XPathNavigator_Namespace_Prefixes</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Namespaces">XPathNavigator_Namespaces</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Namespaces_Tip">XPathNavigator_Namespaces_Tip</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Node_could_not_be_selected">XPathNavigator_Node_could_not_be_selected</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Nothing_selected">XPathNavigator_Nothing_selected</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Refresh_Source_Docs">XPathNavigator_Refresh_Source_Docs</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Refresh_Source_Docs_Tip">XPathNavigator_Refresh_Source_Docs_Tip</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Run_on_selected">XPathNavigator_Run_on_selected</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Run_XPath_Query">XPathNavigator_Run_XPath_Query</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Select_source_first">XPathNavigator_Select_source_first</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Selection">XPathNavigator_Selection</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Show_In_Source">XPathNavigator_Show_In_Source</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Show_In_Source_Tip">XPathNavigator_Show_In_Source_Tip</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_Text">XPathNavigator_Text</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_XML_Source_Document">XPathNavigator_XML_Source_Document</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_XPath_Eval_Failed">XPathNavigator_XPath_Eval_Failed</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_XPath_Navigator">XPathNavigator_XPath_Navigator</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPathNavigator_XPath_Show_In_Source_Failed">XPathNavigator_XPath_Show_In_Source_Failed</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public static java.util.ResourceBundle</code></td><td width="" align="left"><code><a href="#method_getResourceBundle">getResourceBundle</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Field Detail
-               </h2></td></tr></table><h2><a name="field_XPathNavigator_Context">XPathNavigator_Context</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Context</strong></code></p><hr><h2><a name="field_XPathNavigator_Document">XPathNavigator_Document</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Document</strong></code></p><hr><h2><a name="field_XPathNavigator_DOM_Tree">XPathNavigator_DOM_Tree</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_DOM_Tree</strong></code></p><hr><h2><a name="field_XPathNavigator_Expression">XPathNavigator_Expression</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Expression</strong></code></p><hr><h2><a name="field_XPathNavigator_Namespace_Prefixes">XPathNavigator_Namespace_Prefixes</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Namespace_Prefixes</strong></code></p><hr><h2><a name="field_XPathNavigator_Namespaces">XPathNavigator_Namespaces</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Namespaces</strong></code></p><hr><h2><a name="field_XPathNavigator_Namespaces_Tip">XPathNavigator_Namespaces_Tip</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Namespaces_Tip</strong></code></p><hr><h2><a name="field_XPathNavigator_Node_could_not_be_selected">XPathNavigator_Node_could_not_be_selected</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Node_could_not_be_selected</strong></code></p><hr><h2><a name="field_XPathNavigator_Nothing_selected">XPathNavigator_Nothing_selected</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Nothing_selected</strong></code></p><hr><h2><a name="field_XPathNavigator_Refresh_Source_Docs">XPathNavigator_Refresh_Source_Docs</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Refresh_Source_Docs</strong></code></p><hr><h2><a name="field_XPathNavigator_Refresh_Source_Docs_Tip">XPathNavigator_Refresh_Source_Docs_Tip</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Refresh_Source_Docs_Tip</strong></code></p><hr><h2><a name="field_XPathNavigator_Run_on_selected">XPathNavigator_Run_on_selected</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Run_on_selected</strong></code></p><hr><h2><a name="field_XPathNavigator_Run_XPath_Query">XPathNavigator_Run_XPath_Query</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Run_XPath_Query</strong></code></p><hr><h2><a name="field_XPathNavigator_Select_source_first">XPathNavigator_Select_source_first</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Select_source_first</strong></code></p><hr><h2><a name="field_XPathNavigator_Selection">XPathNavigator_Selection</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Selection</strong></code></p><hr><h2><a name="field_XPathNavigator_Show_In_Source">XPathNavigator_Show_In_Source</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Show_In_Source</strong></code></p><hr><h2><a name="field_XPathNavigator_Show_In_Source_Tip">XPathNavigator_Show_In_Source_Tip</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Show_In_Source_Tip</strong></code></p><hr><h2><a name="field_XPathNavigator_Text">XPathNavigator_Text</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_Text</strong></code></p><hr><h2><a name="field_XPathNavigator_XML_Source_Document">XPathNavigator_XML_Source_Document</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_XML_Source_Document</strong></code></p><hr><h2><a name="field_XPathNavigator_XPath_Eval_Failed">XPathNavigator_XPath_Eval_Failed</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_XPath_Eval_Failed</strong></code></p><hr><h2><a name="field_XPathNavigator_XPath_Navigator">XPathNavigator_XPath_Navigator</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_XPath_Navigator</strong></code></p><hr><h2><a name="field_XPathNavigator_XPath_Show_In_Source_Failed">XPathNavigator_XPath_Show_In_Source_Failed</a></h2><p><code>public static  java.lang.String <strong>XPathNavigator_XPath_Show_In_Source_Failed</strong></code></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_getResourceBundle">getResourceBundle</a></h2><p><code>public java.util.ResourceBundle <strong>getResourceBundle</strong>()</code></p><p></p><h3>Returns</h3><p><code>java.util.ResourceBundle</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.XPathViewPlugin.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.XPathViewPlugin.html
deleted file mode 100644
index c3434c2..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.XPathViewPlugin.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui</strong></font><br>
-               Class XPathViewPlugin</h2><br><hr><pre>public class <strong>XPathViewPlugin</strong>
-extends AbstractUIPlugin</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XPathViewPlugin">XPathViewPlugin</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public static org.eclipse.wst.xml.xpath.ui.XPathViewPlugin</code></td><td width="" align="left"><code><a href="#method_getDefault">getDefault</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Returns the shared instance.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static java.lang.String</code></td><td width="" align="left"><code><a href="#method_getPluginId">getPluginId</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.util.ResourceBundle</code></td><td width="" align="left"><code><a href="#method_getResourceBundle">getResourceBundle</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Returns the plugin's resource bundle</td></tr><tr valign="top"><td width="20%" align="right"><code>public static java.lang.String</code></td><td width="" align="left"><code><a href="#method_getResourceString">getResourceString</a>(java.lang.String key)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Returns the string from the plugin's resource bundle,
- or 'key' if not found.</td></tr><tr valign="top"><td width="20%" align="right"><code>public ContextTypeRegistry</code></td><td width="" align="left"><code><a href="#method_getXPathTemplateContextRegistry">getXPathTemplateContextRegistry</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Returns the template context type registry for xpath</td></tr><tr valign="top"><td width="20%" align="right"><code>public TemplateStore</code></td><td width="" align="left"><code><a href="#method_getXPathTemplateStore">getXPathTemplateStore</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Returns the template store for the xpath templates.</td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_info">info</a>(java.lang.String message)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>protected void</code></td><td width="" align="left"><code><a href="#method_initializeImageRegistry">initializeImageRegistry</a>(ImageRegistry reg)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_log">log</a>(java.lang.String message
-         ,
-      java.lang.Throwable ex)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_log">log</a>(java.lang.Throwable ex)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_partActivated">partActivated</a>(IWorkbenchPartReference partRef)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_partBroughtToTop">partBroughtToTop</a>(IWorkbenchPartReference partRef)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_partClosed">partClosed</a>(IWorkbenchPartReference partRef)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_partDeactivated">partDeactivated</a>(IWorkbenchPartReference partRef)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_partHidden">partHidden</a>(IWorkbenchPartReference partRef)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_partInputChanged">partInputChanged</a>(IWorkbenchPartReference partRef)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_partOpened">partOpened</a>(IWorkbenchPartReference partRef)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_partVisible">partVisible</a>(IWorkbenchPartReference partRef)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_start">start</a>(BundleContext context)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               This method is called upon plug-in activation</td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_stop">stop</a>(BundleContext context)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               This method is called when the plug-in is stopped</td></tr><tr valign="top"><td width="20%" align="right"><code>public static void</code></td><td width="" align="left"><code><a href="#method_throwCoreException">throwCoreException</a>(java.lang.String message
-         ,
-      java.lang.Throwable t)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>protected void</code></td><td width="" align="left"><code><a href="#method_updateXPathNavigatorView">updateXPathNavigatorView</a>(IWorkbenchPartReference partRef)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_warn">warn</a>(java.lang.String message)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XPathViewPlugin">XPathViewPlugin</a></h2><p><code>public <strong>XPathViewPlugin</strong>()</code></p><p>The constructor.</p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_getDefault">getDefault</a></h2><p><code>public org.eclipse.wst.xml.xpath.ui.XPathViewPlugin <strong>getDefault</strong>()</code></p><p>Returns the shared instance.</p><h3>Returns</h3><p><code>org.eclipse.wst.xml.xpath.ui.XPathViewPlugin</code></p><hr><h2><a name="method_getPluginId">getPluginId</a></h2><p><code>public java.lang.String <strong>getPluginId</strong>()</code></p><p></p><h3>Returns</h3><p><code>java.lang.String</code></p><hr><h2><a name="method_getResourceBundle">getResourceBundle</a></h2><p><code>public java.util.ResourceBundle <strong>getResourceBundle</strong>()</code></p><p>Returns the plugin's resource bundle</p><h3>Returns</h3><p><code>java.util.ResourceBundle</code></p><hr><h2><a name="method_getResourceString">getResourceString</a></h2><p><code>public java.lang.String <strong>getResourceString</strong>(java.lang.String key)</code></p><p>Returns the string from the plugin's resource bundle,
- or 'key' if not found.</p><h3>Parameters</h3><p><code>key</code></p><h3>Returns</h3><p><code>java.lang.String</code></p><hr><h2><a name="method_getXPathTemplateContextRegistry">getXPathTemplateContextRegistry</a></h2><p><code>public ContextTypeRegistry <strong>getXPathTemplateContextRegistry</strong>()</code></p><p>Returns the template context type registry for xpath</p><h3>Returns</h3><p><code>ContextTypeRegistry</code> - the template context type registry for xpath</p><hr><h2><a name="method_getXPathTemplateStore">getXPathTemplateStore</a></h2><p><code>public TemplateStore <strong>getXPathTemplateStore</strong>()</code></p><p>Returns the template store for the xpath templates.</p><h3>Returns</h3><p><code>TemplateStore</code> - the template store for the xpath templates</p><hr><h2><a name="method_info">info</a></h2><p><code>public void <strong>info</strong>(java.lang.String message)</code></p><p></p><h3>Parameters</h3><p><code>message</code></p><hr><h2><a name="method_initializeImageRegistry">initializeImageRegistry</a></h2><p><code>protected void <strong>initializeImageRegistry</strong>(ImageRegistry reg)</code></p><p></p><h3>Parameters</h3><p><code>reg</code></p><hr><h2><a name="method_log">log</a></h2><p><code>public void <strong>log</strong>(java.lang.String message
-         ,
-      java.lang.Throwable ex)</code></p><p></p><h3>Parameters</h3><p><code>message</code></p><p><code>ex</code></p><hr><h2><a name="method_log">log</a></h2><p><code>public void <strong>log</strong>(java.lang.Throwable ex)</code></p><p></p><h3>Parameters</h3><p><code>ex</code></p><hr><h2><a name="method_partActivated">partActivated</a></h2><p><code>public void <strong>partActivated</strong>(IWorkbenchPartReference partRef)</code></p><p></p><h3>Parameters</h3><p><code>partRef</code></p><hr><h2><a name="method_partBroughtToTop">partBroughtToTop</a></h2><p><code>public void <strong>partBroughtToTop</strong>(IWorkbenchPartReference partRef)</code></p><p></p><h3>Parameters</h3><p><code>partRef</code></p><hr><h2><a name="method_partClosed">partClosed</a></h2><p><code>public void <strong>partClosed</strong>(IWorkbenchPartReference partRef)</code></p><p></p><h3>Parameters</h3><p><code>partRef</code></p><hr><h2><a name="method_partDeactivated">partDeactivated</a></h2><p><code>public void <strong>partDeactivated</strong>(IWorkbenchPartReference partRef)</code></p><p></p><h3>Parameters</h3><p><code>partRef</code></p><hr><h2><a name="method_partHidden">partHidden</a></h2><p><code>public void <strong>partHidden</strong>(IWorkbenchPartReference partRef)</code></p><p></p><h3>Parameters</h3><p><code>partRef</code></p><hr><h2><a name="method_partInputChanged">partInputChanged</a></h2><p><code>public void <strong>partInputChanged</strong>(IWorkbenchPartReference partRef)</code></p><p></p><h3>Parameters</h3><p><code>partRef</code></p><hr><h2><a name="method_partOpened">partOpened</a></h2><p><code>public void <strong>partOpened</strong>(IWorkbenchPartReference partRef)</code></p><p></p><h3>Parameters</h3><p><code>partRef</code></p><hr><h2><a name="method_partVisible">partVisible</a></h2><p><code>public void <strong>partVisible</strong>(IWorkbenchPartReference partRef)</code></p><p></p><h3>Parameters</h3><p><code>partRef</code></p><hr><h2><a name="method_start">start</a></h2><p><code>public void <strong>start</strong>(BundleContext context)</code></p><p>This method is called upon plug-in activation</p><h3>Parameters</h3><p><code>context</code></p><h3>Throws:</h3><p><code>java.lang.Exception</code></p><hr><h2><a name="method_stop">stop</a></h2><p><code>public void <strong>stop</strong>(BundleContext context)</code></p><p>This method is called when the plug-in is stopped</p><h3>Parameters</h3><p><code>context</code></p><h3>Throws:</h3><p><code>java.lang.Exception</code></p><hr><h2><a name="method_throwCoreException">throwCoreException</a></h2><p><code>public void <strong>throwCoreException</strong>(java.lang.String message
-         ,
-      java.lang.Throwable t)</code></p><p></p><h3>Parameters</h3><p><code>message</code></p><p><code>t</code></p><h3>Throws:</h3><p><code>CoreException</code></p><hr><h2><a name="method_updateXPathNavigatorView">updateXPathNavigatorView</a></h2><p><code>protected void <strong>updateXPathNavigatorView</strong>(IWorkbenchPartReference partRef)</code></p><p></p><h3>Parameters</h3><p><code>partRef</code></p><hr><h2><a name="method_warn">warn</a></h2><p><code>public void <strong>warn</strong>(java.lang.String message)</code></p><p></p><h3>Parameters</h3><p><code>message</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMNodeLabelProvider.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMNodeLabelProvider.html
deleted file mode 100644
index b4596d3..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMNodeLabelProvider.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui.views</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui.views</strong></font><br>
-               Class DOMNodeLabelProvider</h2><br><hr><pre>public class <strong>DOMNodeLabelProvider</strong>
-extends LabelProvider</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_DOMNodeLabelProvider">DOMNodeLabelProvider</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public Image</code></td><td width="" align="left"><code><a href="#method_getImage">getImage</a>(java.lang.Object element)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.String</code></td><td width="" align="left"><code><a href="#method_getText">getText</a>(java.lang.Object element)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_DOMNodeLabelProvider">DOMNodeLabelProvider</a></h2><p><code>public <strong>DOMNodeLabelProvider</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_getImage">getImage</a></h2><p><code>public Image <strong>getImage</strong>(java.lang.Object element)</code></p><p></p><h3>Parameters</h3><p><code>element</code></p><h3>Returns</h3><p><code>Image</code></p><hr><h2><a name="method_getText">getText</a></h2><p><code>public java.lang.String <strong>getText</strong>(java.lang.Object element)</code></p><p></p><h3>Parameters</h3><p><code>element</code></p><h3>Returns</h3><p><code>java.lang.String</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMTreeContentProvider.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMTreeContentProvider.html
deleted file mode 100644
index 7ea99b3..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMTreeContentProvider.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui.views</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui.views</strong></font><br>
-               Class DOMTreeContentProvider</h2><br><hr><pre>public class <strong>DOMTreeContentProvider</strong>
-extends java.lang.Object</pre><hr><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Field Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>package-private org.w3c.dom.Node</code></td><td width="80%" align="left"><code><a href="#field_node">node</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>package-private static  java.lang.Object[]</code></td><td width="80%" align="left"><code><a href="#field_NOTHING">NOTHING</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><br><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_DOMTreeContentProvider">DOMTreeContentProvider</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_dispose">dispose</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.Object[]</code></td><td width="" align="left"><code><a href="#method_getChildren">getChildren</a>(java.lang.Object parentElement)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.Object[]</code></td><td width="" align="left"><code><a href="#method_getElements">getElements</a>(java.lang.Object inputElement)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.Object</code></td><td width="" align="left"><code><a href="#method_getParent">getParent</a>(java.lang.Object element)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public boolean</code></td><td width="" align="left"><code><a href="#method_hasChildren">hasChildren</a>(java.lang.Object element)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_inputChanged">inputChanged</a>(Viewer viewer
-         ,
-      java.lang.Object oldInput
-         ,
-      java.lang.Object newInput)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Field Detail
-               </h2></td></tr></table><h2><a name="field_node">node</a></h2><p><code>package-private org.w3c.dom.Node <strong>node</strong></code></p><hr><h2><a name="field_NOTHING">NOTHING</a></h2><p><code>package-private static  java.lang.Object[] <strong>NOTHING</strong></code></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_DOMTreeContentProvider">DOMTreeContentProvider</a></h2><p><code>public <strong>DOMTreeContentProvider</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_dispose">dispose</a></h2><p><code>public void <strong>dispose</strong>()</code></p><p></p><hr><h2><a name="method_getChildren">getChildren</a></h2><p><code>public java.lang.Object[] <strong>getChildren</strong>(java.lang.Object parentElement)</code></p><p></p><h3>Parameters</h3><p><code>parentElement</code></p><h3>Returns</h3><p><code>java.lang.Object[]</code></p><hr><h2><a name="method_getElements">getElements</a></h2><p><code>public java.lang.Object[] <strong>getElements</strong>(java.lang.Object inputElement)</code></p><p></p><h3>Parameters</h3><p><code>inputElement</code></p><h3>Returns</h3><p><code>java.lang.Object[]</code></p><hr><h2><a name="method_getParent">getParent</a></h2><p><code>public java.lang.Object <strong>getParent</strong>(java.lang.Object element)</code></p><p></p><h3>Parameters</h3><p><code>element</code></p><h3>Returns</h3><p><code>java.lang.Object</code></p><hr><h2><a name="method_hasChildren">hasChildren</a></h2><p><code>public boolean <strong>hasChildren</strong>(java.lang.Object element)</code></p><p></p><h3>Parameters</h3><p><code>element</code></p><h3>Returns</h3><p><code>boolean</code></p><hr><h2><a name="method_inputChanged">inputChanged</a></h2><p><code>public void <strong>inputChanged</strong>(Viewer viewer
-         ,
-      java.lang.Object oldInput
-         ,
-      java.lang.Object newInput)</code></p><p></p><h3>Parameters</h3><p><code>viewer</code></p><p><code>oldInput</code></p><p><code>newInput</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMViewerFilter.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMViewerFilter.html
deleted file mode 100644
index 5724acf..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMViewerFilter.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui.views</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui.views</strong></font><br>
-               Class DOMViewerFilter</h2><br><hr><pre>public class <strong>DOMViewerFilter</strong>
-extends ViewerFilter</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_DOMViewerFilter">DOMViewerFilter</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public boolean</code></td><td width="" align="left"><code><a href="#method_select">select</a>(Viewer viewer
-         ,
-      java.lang.Object parentElement
-         ,
-      java.lang.Object element)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_DOMViewerFilter">DOMViewerFilter</a></h2><p><code>public <strong>DOMViewerFilter</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_select">select</a></h2><p><code>public boolean <strong>select</strong>(Viewer viewer
-         ,
-      java.lang.Object parentElement
-         ,
-      java.lang.Object element)</code></p><p></p><h3>Parameters</h3><p><code>viewer</code></p><p><code>parentElement</code></p><p><code>element</code></p><h3>Returns</h3><p><code>boolean</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.EditNamespacePrefixDialog.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.EditNamespacePrefixDialog.html
deleted file mode 100644
index 351929b..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.EditNamespacePrefixDialog.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui.views</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui.views</strong></font><br>
-               Class EditNamespacePrefixDialog</h2><br><hr><pre>public class <strong>EditNamespacePrefixDialog</strong>
-extends Dialog</pre><hr><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Field Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>protected Label</code></td><td width="80%" align="left"><code><a href="#field_errorMessageLabel">errorMessageLabel</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>protected java.util.List</code></td><td width="80%" align="left"><code><a href="#field_namespaceInfoList">namespaceInfoList</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>protected IPath</code></td><td width="80%" align="left"><code><a href="#field_resourceLocation">resourceLocation</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><br><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_EditNamespacePrefixDialog">EditNamespacePrefixDialog</a></strong>(Shell parentShell
-         ,
-      IPath resourceLocation)</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>protected void</code></td><td width="" align="left"><code><a href="#method_createButtonsForButtonBar">createButtonsForButtonBar</a>(Composite parent)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>protected Control</code></td><td width="" align="left"><code><a href="#method_createDialogArea">createDialogArea</a>(Composite parent)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>protected Control</code></td><td width="" align="left"><code><a href="#method_getDialogArea">getDialogArea</a>(Composite parent)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.util.List</code></td><td width="" align="left"><code><a href="#method_getNamespaceInfoList">getNamespaceInfoList</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_setNamespaceInfoList">setNamespaceInfoList</a>(java.util.List list)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_updateErrorMessage">updateErrorMessage</a>(java.util.List namespaceInfoList)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_updateOccured">updateOccured</a>(java.lang.Object object
-         ,
-      java.lang.Object arg)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Field Detail
-               </h2></td></tr></table><h2><a name="field_errorMessageLabel">errorMessageLabel</a></h2><p><code>protected Label <strong>errorMessageLabel</strong></code></p><hr><h2><a name="field_namespaceInfoList">namespaceInfoList</a></h2><p><code>protected java.util.List <strong>namespaceInfoList</strong></code></p><hr><h2><a name="field_resourceLocation">resourceLocation</a></h2><p><code>protected IPath <strong>resourceLocation</strong></code></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_EditNamespacePrefixDialog">EditNamespacePrefixDialog</a></h2><p><code>public <strong>EditNamespacePrefixDialog</strong>(Shell parentShell
-         ,
-      IPath resourceLocation)</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_createButtonsForButtonBar">createButtonsForButtonBar</a></h2><p><code>protected void <strong>createButtonsForButtonBar</strong>(Composite parent)</code></p><p></p><h3>Parameters</h3><p><code>parent</code></p><hr><h2><a name="method_createDialogArea">createDialogArea</a></h2><p><code>protected Control <strong>createDialogArea</strong>(Composite parent)</code></p><p></p><h3>Parameters</h3><p><code>parent</code></p><h3>Returns</h3><p><code>Control</code></p><hr><h2><a name="method_getDialogArea">getDialogArea</a></h2><p><code>protected Control <strong>getDialogArea</strong>(Composite parent)</code></p><p></p><h3>Parameters</h3><p><code>parent</code></p><h3>Returns</h3><p><code>Control</code></p><hr><h2><a name="method_getNamespaceInfoList">getNamespaceInfoList</a></h2><p><code>public java.util.List <strong>getNamespaceInfoList</strong>()</code></p><p></p><h3>Returns</h3><p><code>java.util.List</code></p><hr><h2><a name="method_setNamespaceInfoList">setNamespaceInfoList</a></h2><p><code>public void <strong>setNamespaceInfoList</strong>(java.util.List list)</code></p><p></p><h3>Parameters</h3><p><code>list</code></p><hr><h2><a name="method_updateErrorMessage">updateErrorMessage</a></h2><p><code>public void <strong>updateErrorMessage</strong>(java.util.List namespaceInfoList)</code></p><p></p><h3>Parameters</h3><p><code>namespaceInfoList</code></p><hr><h2><a name="method_updateOccured">updateOccured</a></h2><p><code>public void <strong>updateOccured</strong>(java.lang.Object object
-         ,
-      java.lang.Object arg)</code></p><p></p><h3>Parameters</h3><p><code>object</code></p><p><code>arg</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.EditorReferenceLabelProvider.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.EditorReferenceLabelProvider.html
deleted file mode 100644
index 6c0fcc3..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.EditorReferenceLabelProvider.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui.views</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui.views</strong></font><br>
-               Class XPathNavigator.EditorReferenceLabelProvider</h2><br><hr><pre>package-private class <strong>XPathNavigator.EditorReferenceLabelProvider</strong>
-extends LabelProvider</pre><hr><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Field Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public static  char</code></td><td width="80%" align="left"><code><a href="#field_DIRTY_INDICATOR">DIRTY_INDICATOR</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               A string used to indicate that an editor is dirty</td></tr></table><br><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XPathNavigator.EditorReferenceLabelProvider">XPathNavigator.EditorReferenceLabelProvider</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public Image</code></td><td width="" align="left"><code><a href="#method_getImage">getImage</a>(java.lang.Object element)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.String</code></td><td width="" align="left"><code><a href="#method_getText">getText</a>(java.lang.Object element)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Field Detail
-               </h2></td></tr></table><h2><a name="field_DIRTY_INDICATOR">DIRTY_INDICATOR</a></h2><p><code>public static  char <strong>DIRTY_INDICATOR</strong></code></p><table><tr><td>A string used to indicate that an editor is dirty</td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XPathNavigator.EditorReferenceLabelProvider">XPathNavigator.EditorReferenceLabelProvider</a></h2><p><code>package-private <strong>XPathNavigator.EditorReferenceLabelProvider</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_getImage">getImage</a></h2><p><code>public Image <strong>getImage</strong>(java.lang.Object element)</code></p><p></p><h3>Parameters</h3><p><code>element</code></p><h3>Returns</h3><p><code>Image</code></p><hr><h2><a name="method_getText">getText</a></h2><p><code>public java.lang.String <strong>getText</strong>(java.lang.Object element)</code></p><p></p><h3>Parameters</h3><p><code>element</code></p><h3>Returns</h3><p><code>java.lang.String</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.RefreshAction.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.RefreshAction.html
deleted file mode 100644
index 3fbec3a..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.RefreshAction.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui.views</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui.views</strong></font><br>
-               Class XPathNavigator.RefreshAction</h2><br><hr><pre>package-private class <strong>XPathNavigator.RefreshAction</strong>
-extends Action</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XPathNavigator.RefreshAction">XPathNavigator.RefreshAction</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_run">run</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XPathNavigator.RefreshAction">XPathNavigator.RefreshAction</a></h2><p><code>package-private <strong>XPathNavigator.RefreshAction</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_run">run</a></h2><p><code>public void <strong>run</strong>()</code></p><p></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.ShowInSourceAction.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.ShowInSourceAction.html
deleted file mode 100644
index 9ecb08e..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.ShowInSourceAction.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui.views</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui.views</strong></font><br>
-               Class XPathNavigator.ShowInSourceAction</h2><br><hr><pre>package-private class <strong>XPathNavigator.ShowInSourceAction</strong>
-extends Action</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XPathNavigator.ShowInSourceAction">XPathNavigator.ShowInSourceAction</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_run">run</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XPathNavigator.ShowInSourceAction">XPathNavigator.ShowInSourceAction</a></h2><p><code>package-private <strong>XPathNavigator.ShowInSourceAction</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_run">run</a></h2><p><code>public void <strong>run</strong>()</code></p><p></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XMLEditorsContentProvider.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XMLEditorsContentProvider.html
deleted file mode 100644
index d357359..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XMLEditorsContentProvider.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui.views</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui.views</strong></font><br>
-               Class XPathNavigator.XMLEditorsContentProvider</h2><br><hr><pre>package-private class <strong>XPathNavigator.XMLEditorsContentProvider</strong>
-extends java.lang.Object</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XPathNavigator.XMLEditorsContentProvider">XPathNavigator.XMLEditorsContentProvider</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_dispose">dispose</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.Object[]</code></td><td width="" align="left"><code><a href="#method_getElements">getElements</a>(java.lang.Object inputElement)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_inputChanged">inputChanged</a>(Viewer viewer
-         ,
-      java.lang.Object oldInput
-         ,
-      java.lang.Object newInput)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XPathNavigator.XMLEditorsContentProvider">XPathNavigator.XMLEditorsContentProvider</a></h2><p><code>package-private <strong>XPathNavigator.XMLEditorsContentProvider</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_dispose">dispose</a></h2><p><code>public void <strong>dispose</strong>()</code></p><p></p><hr><h2><a name="method_getElements">getElements</a></h2><p><code>public java.lang.Object[] <strong>getElements</strong>(java.lang.Object inputElement)</code></p><p></p><h3>Parameters</h3><p><code>inputElement</code></p><h3>Returns</h3><p><code>java.lang.Object[]</code></p><hr><h2><a name="method_inputChanged">inputChanged</a></h2><p><code>public void <strong>inputChanged</strong>(Viewer viewer
-         ,
-      java.lang.Object oldInput
-         ,
-      java.lang.Object newInput)</code></p><p></p><h3>Parameters</h3><p><code>viewer</code></p><p><code>oldInput</code></p><p><code>newInput</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XPathAction.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XPathAction.html
deleted file mode 100644
index d8a4d8f..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XPathAction.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui.views</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui.views</strong></font><br>
-               Class XPathNavigator.XPathAction</h2><br><hr><pre>package-private class <strong>XPathNavigator.XPathAction</strong>
-extends Action</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XPathNavigator.XPathAction">XPathNavigator.XPathAction</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_run">run</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XPathNavigator.XPathAction">XPathNavigator.XPathAction</a></h2><p><code>package-private <strong>XPathNavigator.XPathAction</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_run">run</a></h2><p><code>public void <strong>run</strong>()</code></p><p></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.html
deleted file mode 100644
index 2c51030..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xml.xpath.ui.views</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xml.xpath.ui.views</strong></font><br>
-               Class XPathNavigator</h2><br><hr><pre>public class <strong>XPathNavigator</strong>
-extends ViewPart</pre><hr><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Field Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>protected IMemento</code></td><td width="80%" align="left"><code><a href="#field_memento">memento</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_MEMENTO_QUERYCONTEXT_DOCUMENT">MEMENTO_QUERYCONTEXT_DOCUMENT</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_MEMENTO_QUERYCONTEXT_KEY">MEMENTO_QUERYCONTEXT_KEY</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_MEMENTO_QUERYCONTEXT_SELECTION">MEMENTO_QUERYCONTEXT_SELECTION</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_MEMENTO_XPATHNAVIGATOR_SECTION">MEMENTO_XPATHNAVIGATOR_SECTION</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_MEMENTO_XPATHQUERY_KEY">MEMENTO_XPATHQUERY_KEY</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>protected java.util.WeakHashMap</code></td><td width="80%" align="left"><code><a href="#field_namespaceInfo">namespaceInfo</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><br><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XPathNavigator">XPathNavigator</a></strong>()</code></td></tr><tr><td><code><strong><a href="#con_XPathNavigator.EditorReferenceLabelProvider">XPathNavigator.EditorReferenceLabelProvider</a></strong>()</code></td></tr><tr><td><code><strong><a href="#con_XPathNavigator.RefreshAction">XPathNavigator.RefreshAction</a></strong>()</code></td></tr><tr><td><code><strong><a href="#con_XPathNavigator.ShowInSourceAction">XPathNavigator.ShowInSourceAction</a></strong>()</code></td></tr><tr><td><code><strong><a href="#con_XPathNavigator.XMLEditorsContentProvider">XPathNavigator.XMLEditorsContentProvider</a></strong>()</code></td></tr><tr><td><code><strong><a href="#con_XPathNavigator.XPathAction">XPathNavigator.XPathAction</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_createPartControl">createPartControl</a>(Composite parent)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               This is a callback that will allow us to create the viewer and initialize
- it.</td></tr><tr valign="top"><td width="20%" align="right"><code>protected org.w3c.dom.Element</code></td><td width="" align="left"><code><a href="#method_getQueryContext">getQueryContext</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>protected org.w3c.dom.Document</code></td><td width="" align="left"><code><a href="#method_getSelectedDocument">getSelectedDocument</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_init">init</a>(IViewSite site
-         ,
-      IMemento memento)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>protected void</code></td><td width="" align="left"><code><a href="#method_restoreState">restoreState</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_saveState">saveState</a>(IMemento memento)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_setFocus">setFocus</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Passing the focus request to the viewer's control.</td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_update">update</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Field Detail
-               </h2></td></tr></table><h2><a name="field_memento">memento</a></h2><p><code>protected IMemento <strong>memento</strong></code></p><hr><h2><a name="field_MEMENTO_QUERYCONTEXT_DOCUMENT">MEMENTO_QUERYCONTEXT_DOCUMENT</a></h2><p><code>public static  java.lang.String <strong>MEMENTO_QUERYCONTEXT_DOCUMENT</strong></code></p><hr><h2><a name="field_MEMENTO_QUERYCONTEXT_KEY">MEMENTO_QUERYCONTEXT_KEY</a></h2><p><code>public static  java.lang.String <strong>MEMENTO_QUERYCONTEXT_KEY</strong></code></p><hr><h2><a name="field_MEMENTO_QUERYCONTEXT_SELECTION">MEMENTO_QUERYCONTEXT_SELECTION</a></h2><p><code>public static  java.lang.String <strong>MEMENTO_QUERYCONTEXT_SELECTION</strong></code></p><hr><h2><a name="field_MEMENTO_XPATHNAVIGATOR_SECTION">MEMENTO_XPATHNAVIGATOR_SECTION</a></h2><p><code>public static  java.lang.String <strong>MEMENTO_XPATHNAVIGATOR_SECTION</strong></code></p><hr><h2><a name="field_MEMENTO_XPATHQUERY_KEY">MEMENTO_XPATHQUERY_KEY</a></h2><p><code>public static  java.lang.String <strong>MEMENTO_XPATHQUERY_KEY</strong></code></p><hr><h2><a name="field_namespaceInfo">namespaceInfo</a></h2><p><code>protected java.util.WeakHashMap <strong>namespaceInfo</strong></code></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XPathNavigator">XPathNavigator</a></h2><p><code>public <strong>XPathNavigator</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_createPartControl">createPartControl</a></h2><p><code>public void <strong>createPartControl</strong>(Composite parent)</code></p><p>This is a callback that will allow us to create the viewer and initialize
- it.</p><h3>Parameters</h3><p><code>parent</code></p><hr><h2><a name="method_getQueryContext">getQueryContext</a></h2><p><code>protected org.w3c.dom.Element <strong>getQueryContext</strong>()</code></p><p></p><h3>Returns</h3><p><code>org.w3c.dom.Element</code></p><hr><h2><a name="method_getSelectedDocument">getSelectedDocument</a></h2><p><code>protected org.w3c.dom.Document <strong>getSelectedDocument</strong>()</code></p><p></p><h3>Returns</h3><p><code>org.w3c.dom.Document</code></p><hr><h2><a name="method_init">init</a></h2><p><code>public void <strong>init</strong>(IViewSite site
-         ,
-      IMemento memento)</code></p><p></p><h3>Parameters</h3><p><code>site</code></p><p><code>memento</code></p><h3>Throws:</h3><p><code>PartInitException</code></p><hr><h2><a name="method_restoreState">restoreState</a></h2><p><code>protected void <strong>restoreState</strong>()</code></p><p></p><hr><h2><a name="method_saveState">saveState</a></h2><p><code>public void <strong>saveState</strong>(IMemento memento)</code></p><p></p><h3>Parameters</h3><p><code>memento</code></p><hr><h2><a name="method_setFocus">setFocus</a></h2><p><code>public void <strong>setFocus</strong>()</code></p><p>Passing the focus request to the viewer's control.</p><hr><h2><a name="method_update">update</a></h2><p><code>public void <strong>update</strong>()</code></p><p></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.Messages.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.Messages.html
deleted file mode 100644
index 2c68439..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.Messages.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xsl.core</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xsl.core</strong></font><br>
-               Class Messages</h2><br><hr><pre>public class <strong>Messages</strong>
-extends NLS</pre><p></p><hr><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Field Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XIncludeTask_0">XIncludeTask_0</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XIncludeTask_1">XIncludeTask_1</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XIncludeTask_2">XIncludeTask_2</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XIncludeTask_3">XIncludeTask_3</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XIncludeTask_4">XIncludeTask_4</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XIncludeTask_5">XIncludeTask_5</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XIncludeTask_6">XIncludeTask_6</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XIncludeTask_7">XIncludeTask_7</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XIncludeTask_8">XIncludeTask_8</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XIncludeTask_9">XIncludeTask_9</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLCorePlugin_badInitializationData">XSLCorePlugin_badInitializationData</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLCorePlugin_coreError">XSLCorePlugin_coreError</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLCorePlugin_parserConfiguration">XSLCorePlugin_parserConfiguration</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_1">XSLValidator_1</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_10">XSLValidator_10</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Stylesheet importing itself</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_11">XSLValidator_11</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Template conflict (internal)</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_12">XSLValidator_12</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Template conflict (included)</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_13">XSLValidator_13</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Template conflict (external)</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_14">XSLValidator_14</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Parameter missing name attribute</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_15">XSLValidator_15</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Parameter with empty name attribute</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_16">XSLValidator_16</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Duplicate parameter</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_18">XSLValidator_18</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Unresolved named template</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_2">XSLValidator_2</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Circular reference</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_20">XSLValidator_20</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Parameter without default value</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_22">XSLValidator_22</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Parameter does not exist</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_23">XSLValidator_23</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               href attribute is required</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_3">XSLValidator_3</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Missing parameter</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_4">XSLValidator_4</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Unresolved include</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_6">XSLValidator_6</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Stylesheet includes itself</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSLValidator_8">XSLValidator_8</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Unresolved import</td></tr></table><br><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_Messages">Messages</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public static void</code></td><td width="" align="left"><code><a href="#method_reloadMessages">reloadMessages</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add JavaDoc</td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Field Detail
-               </h2></td></tr></table><h2><a name="field_XIncludeTask_0">XIncludeTask_0</a></h2><p><code>public static  java.lang.String <strong>XIncludeTask_0</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XIncludeTask_1">XIncludeTask_1</a></h2><p><code>public static  java.lang.String <strong>XIncludeTask_1</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XIncludeTask_2">XIncludeTask_2</a></h2><p><code>public static  java.lang.String <strong>XIncludeTask_2</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XIncludeTask_3">XIncludeTask_3</a></h2><p><code>public static  java.lang.String <strong>XIncludeTask_3</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XIncludeTask_4">XIncludeTask_4</a></h2><p><code>public static  java.lang.String <strong>XIncludeTask_4</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XIncludeTask_5">XIncludeTask_5</a></h2><p><code>public static  java.lang.String <strong>XIncludeTask_5</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XIncludeTask_6">XIncludeTask_6</a></h2><p><code>public static  java.lang.String <strong>XIncludeTask_6</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XIncludeTask_7">XIncludeTask_7</a></h2><p><code>public static  java.lang.String <strong>XIncludeTask_7</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XIncludeTask_8">XIncludeTask_8</a></h2><p><code>public static  java.lang.String <strong>XIncludeTask_8</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XIncludeTask_9">XIncludeTask_9</a></h2><p><code>public static  java.lang.String <strong>XIncludeTask_9</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XSLCorePlugin_badInitializationData">XSLCorePlugin_badInitializationData</a></h2><p><code>public static  java.lang.String <strong>XSLCorePlugin_badInitializationData</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XSLCorePlugin_coreError">XSLCorePlugin_coreError</a></h2><p><code>public static  java.lang.String <strong>XSLCorePlugin_coreError</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XSLCorePlugin_parserConfiguration">XSLCorePlugin_parserConfiguration</a></h2><p><code>public static  java.lang.String <strong>XSLCorePlugin_parserConfiguration</strong></code></p><table><tr><td>TODO: Add JavaDoc</td></tr></table><hr><h2><a name="field_XSLValidator_1">XSLValidator_1</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_1</strong></code></p><hr><h2><a name="field_XSLValidator_10">XSLValidator_10</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_10</strong></code></p><table><tr><td>Stylesheet importing itself</td></tr></table><hr><h2><a name="field_XSLValidator_11">XSLValidator_11</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_11</strong></code></p><table><tr><td>Template conflict (internal)</td></tr></table><hr><h2><a name="field_XSLValidator_12">XSLValidator_12</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_12</strong></code></p><table><tr><td>Template conflict (included)</td></tr></table><hr><h2><a name="field_XSLValidator_13">XSLValidator_13</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_13</strong></code></p><table><tr><td>Template conflict (external)</td></tr></table><hr><h2><a name="field_XSLValidator_14">XSLValidator_14</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_14</strong></code></p><table><tr><td>Parameter missing name attribute</td></tr></table><hr><h2><a name="field_XSLValidator_15">XSLValidator_15</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_15</strong></code></p><table><tr><td>Parameter with empty name attribute</td></tr></table><hr><h2><a name="field_XSLValidator_16">XSLValidator_16</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_16</strong></code></p><table><tr><td>Duplicate parameter</td></tr></table><hr><h2><a name="field_XSLValidator_18">XSLValidator_18</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_18</strong></code></p><table><tr><td>Unresolved named template</td></tr></table><hr><h2><a name="field_XSLValidator_2">XSLValidator_2</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_2</strong></code></p><table><tr><td>Circular reference</td></tr></table><hr><h2><a name="field_XSLValidator_20">XSLValidator_20</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_20</strong></code></p><table><tr><td>Parameter without default value</td></tr></table><hr><h2><a name="field_XSLValidator_22">XSLValidator_22</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_22</strong></code></p><table><tr><td>Parameter does not exist</td></tr></table><hr><h2><a name="field_XSLValidator_23">XSLValidator_23</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_23</strong></code></p><table><tr><td>href attribute is required</td></tr></table><hr><h2><a name="field_XSLValidator_3">XSLValidator_3</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_3</strong></code></p><table><tr><td>Missing parameter</td></tr></table><hr><h2><a name="field_XSLValidator_4">XSLValidator_4</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_4</strong></code></p><table><tr><td>Unresolved include</td></tr></table><hr><h2><a name="field_XSLValidator_6">XSLValidator_6</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_6</strong></code></p><table><tr><td>Stylesheet includes itself</td></tr></table><hr><h2><a name="field_XSLValidator_8">XSLValidator_8</a></h2><p><code>public static  java.lang.String <strong>XSLValidator_8</strong></code></p><table><tr><td>Unresolved import</td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_Messages">Messages</a></h2><p><code>public <strong>Messages</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_reloadMessages">reloadMessages</a></h2><p><code>public void <strong>reloadMessages</strong>()</code></p><p>TODO: Add JavaDoc</p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.ValidationPreferences.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.ValidationPreferences.html
deleted file mode 100644
index 0a6aa83..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.ValidationPreferences.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xsl.core</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xsl.core</strong></font><br>
-               Class ValidationPreferences</h2><br><hr><pre>public class <strong>ValidationPreferences</strong>
-extends java.lang.Object</pre>Preference constants specific to the XSL validator.<p></p><p></p><hr><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Field Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_CALL_TEMPLATES">CALL_TEMPLATES</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The level at which an unresolved called template is reported. 
- &lt;p&gt;
- Value is one of &lt;code&gt;IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO&lt;/code&gt;
- &lt;/p&gt;</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_CIRCULAR_REF">CIRCULAR_REF</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The level at which an include/import circular references is reported.
- &lt;p&gt;
- Value is one of &lt;code&gt;IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO&lt;/code&gt;
- &lt;/p&gt;</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_DUPLICATE_PARAMETER">DUPLICATE_PARAMETER</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The level at which a duplicate parameter is reported.
- &lt;p&gt;
- Value is one of &lt;code&gt;IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO&lt;/code&gt;
- &lt;/p&gt;</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_EMPTY_PARAM">EMPTY_PARAM</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The level at which a parameter that does not have a default value and does not specify a value is reported.
- &lt;p&gt;
- Value is one of &lt;code&gt;IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO&lt;/code&gt;
- &lt;/p&gt;</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_MAX_ERRORS">MAX_ERRORS</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The maximum number of errors allowed per XSL file.
- &lt;p&gt;
- Value is of type &lt;code&gt;Integer&lt;/code&gt;.
- &lt;/p&gt;</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_MISSING_INCLUDE">MISSING_INCLUDE</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The level at which an unresolved import or included is reported.
- &lt;p&gt;
- Value is one of &lt;code&gt;IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO&lt;/code&gt;
- &lt;/p&gt;</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_MISSING_PARAM">MISSING_PARAM</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The level at which a missing parameter is reported.
- &lt;p&gt;
- Value is one of &lt;code&gt;IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO&lt;/code&gt;
- &lt;/p&gt;</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_NAME_ATTRIBUTE_EMPTY">NAME_ATTRIBUTE_EMPTY</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The level at which a parameter with an empty name attribute is reported.
- &lt;p&gt;
- Value is one of &lt;code&gt;IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO&lt;/code&gt;
- &lt;/p&gt;</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_NAME_ATTRIBUTE_MISSING">NAME_ATTRIBUTE_MISSING</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The level at which a parameter without a name attribute is reported.
- &lt;p&gt;
- Value is one of &lt;code&gt;IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO&lt;/code&gt;
- &lt;/p&gt;</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_TEMPLATE_CONFLICT">TEMPLATE_CONFLICT</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The level at which a template conflict is reported.
- &lt;p&gt;
- Value is one of &lt;code&gt;IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO&lt;/code&gt;
- &lt;/p&gt;</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XPATHS">XPATHS</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The level at which an invalid XPath is reported.
- &lt;p&gt;
- Value is one of &lt;code&gt;IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO&lt;/code&gt;
- &lt;/p&gt;</td></tr></table><br><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_ValidationPreferences">ValidationPreferences</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Field Detail
-               </h2></td></tr></table><h2><a name="field_CALL_TEMPLATES">CALL_TEMPLATES</a></h2><p><code>public static  java.lang.String <strong>CALL_TEMPLATES</strong></code></p><table><tr><td>The level at which an unresolved called template is reported. 
- <p>
- Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
- </p></td></tr></table><hr><h2><a name="field_CIRCULAR_REF">CIRCULAR_REF</a></h2><p><code>public static  java.lang.String <strong>CIRCULAR_REF</strong></code></p><table><tr><td>The level at which an include/import circular references is reported.
- <p>
- Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
- </p></td></tr></table><hr><h2><a name="field_DUPLICATE_PARAMETER">DUPLICATE_PARAMETER</a></h2><p><code>public static  java.lang.String <strong>DUPLICATE_PARAMETER</strong></code></p><table><tr><td>The level at which a duplicate parameter is reported.
- <p>
- Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
- </p></td></tr></table><hr><h2><a name="field_EMPTY_PARAM">EMPTY_PARAM</a></h2><p><code>public static  java.lang.String <strong>EMPTY_PARAM</strong></code></p><table><tr><td>The level at which a parameter that does not have a default value and does not specify a value is reported.
- <p>
- Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
- </p></td></tr></table><hr><h2><a name="field_MAX_ERRORS">MAX_ERRORS</a></h2><p><code>public static  java.lang.String <strong>MAX_ERRORS</strong></code></p><table><tr><td>The maximum number of errors allowed per XSL file.
- <p>
- Value is of type <code>Integer</code>.
- </p></td></tr></table><hr><h2><a name="field_MISSING_INCLUDE">MISSING_INCLUDE</a></h2><p><code>public static  java.lang.String <strong>MISSING_INCLUDE</strong></code></p><table><tr><td>The level at which an unresolved import or included is reported.
- <p>
- Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
- </p></td></tr></table><hr><h2><a name="field_MISSING_PARAM">MISSING_PARAM</a></h2><p><code>public static  java.lang.String <strong>MISSING_PARAM</strong></code></p><table><tr><td>The level at which a missing parameter is reported.
- <p>
- Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
- </p></td></tr></table><hr><h2><a name="field_NAME_ATTRIBUTE_EMPTY">NAME_ATTRIBUTE_EMPTY</a></h2><p><code>public static  java.lang.String <strong>NAME_ATTRIBUTE_EMPTY</strong></code></p><table><tr><td>The level at which a parameter with an empty name attribute is reported.
- <p>
- Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
- </p></td></tr></table><hr><h2><a name="field_NAME_ATTRIBUTE_MISSING">NAME_ATTRIBUTE_MISSING</a></h2><p><code>public static  java.lang.String <strong>NAME_ATTRIBUTE_MISSING</strong></code></p><table><tr><td>The level at which a parameter without a name attribute is reported.
- <p>
- Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
- </p></td></tr></table><hr><h2><a name="field_TEMPLATE_CONFLICT">TEMPLATE_CONFLICT</a></h2><p><code>public static  java.lang.String <strong>TEMPLATE_CONFLICT</strong></code></p><table><tr><td>The level at which a template conflict is reported.
- <p>
- Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
- </p></td></tr></table><hr><h2><a name="field_XPATHS">XPATHS</a></h2><p><code>public static  java.lang.String <strong>XPATHS</strong></code></p><table><tr><td>The level at which an invalid XPath is reported.
- <p>
- Value is one of <code>IMarker.SEVERITY_ERROR, IMarker.SEVERITY_WARNING, IMarker.SEVERITY_INFO</code>
- </p></td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_ValidationPreferences">ValidationPreferences</a></h2><p><code>public <strong>ValidationPreferences</strong>()</code></p><p></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.XSLCore.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.XSLCore.html
deleted file mode 100644
index 5c25ec5..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.XSLCore.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xsl.core</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xsl.core</strong></font><br>
-               Class XSLCore</h2><br><hr><pre>public class <strong>XSLCore</strong>
-extends java.lang.Object</pre>The interface to all aspects of the XSL core functionality.
- <p>
- This is responsible for building and maintaining the cache of built XSL models.
- </p><p></p><hr><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Field Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSL_CONTENT_TYPE">XSL_CONTENT_TYPE</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The XSL content type (= org.eclipse.wst.xml.core.xslsource)</td></tr><tr valign="top"><td width="20%" align="right"><code>public static  java.lang.String</code></td><td width="80%" align="left"><code><a href="#field_XSL_NAMESPACE_URI">XSL_NAMESPACE_URI</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               The XSL namespace URI (= http://www.w3.org/1999/XSL/Transform)</td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public StylesheetModel</code></td><td width="" align="left"><code><a href="#method_buildStylesheet">buildStylesheet</a>(IFile file)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Completely rebuild the source file from its DOM</td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_clean">clean</a>(IProject project
-         ,
-      IProgressMonitor monitor)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Clean all of the stylesheets from the given project.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static org.eclipse.wst.xsl.core.XSLCore</code></td><td width="" align="left"><code><a href="#method_getInstance">getInstance</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Get the singleton <code>XSLCore</code> instance.</td></tr><tr valign="top"><td width="20%" align="right"><code>public StylesheetModel</code></td><td width="" align="left"><code><a href="#method_getStylesheet">getStylesheet</a>(IFile file)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Get the cached stylesheet, or build it if it has not yet been built.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static boolean</code></td><td width="" align="left"><code><a href="#method_isXMLFile">isXMLFile</a>(IFile file)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Determine whether the given file is an XML file by inspecting its content types.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static boolean</code></td><td width="" align="left"><code><a href="#method_isXSLFile">isXSLFile</a>(IFile file)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Determine whether the given file is an XSL file by inspecting its content types.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static boolean</code></td><td width="" align="left"><code><a href="#method_isXSLNamespace">isXSLNamespace</a>(IDOMNode node)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Takes a given <code>IDOMNode</code> and returns whether it 
- is part of the the XSLT Namespace.</td></tr><tr valign="top"><td width="20%" align="right"><code>public static IFile</code></td><td width="" align="left"><code><a href="#method_resolveFile">resolveFile</a>(IFile currentFile
-         ,
-      java.lang.String uri)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               Locates a file for the given current file and URI.</td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Field Detail
-               </h2></td></tr></table><h2><a name="field_XSL_CONTENT_TYPE">XSL_CONTENT_TYPE</a></h2><p><code>public static  java.lang.String <strong>XSL_CONTENT_TYPE</strong></code></p><table><tr><td>The XSL content type (= org.eclipse.wst.xml.core.xslsource)</td></tr></table><hr><h2><a name="field_XSL_NAMESPACE_URI">XSL_NAMESPACE_URI</a></h2><p><code>public static  java.lang.String <strong>XSL_NAMESPACE_URI</strong></code></p><table><tr><td>The XSL namespace URI (= http://www.w3.org/1999/XSL/Transform)</td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_buildStylesheet">buildStylesheet</a></h2><p><code>public StylesheetModel <strong>buildStylesheet</strong>(IFile file)</code></p><p>Completely rebuild the source file from its DOM</p><h3>Parameters</h3><p><code>file</code></p><h3>Returns</h3><p><code>StylesheetModel</code> - the stylesheet model, or null if it could not be created.</p><hr><h2><a name="method_clean">clean</a></h2><p><code>public void <strong>clean</strong>(IProject project
-         ,
-      IProgressMonitor monitor)</code></p><p>Clean all of the stylesheets from the given project.</p><h3>Parameters</h3><p><code>project</code> - the project to be cleaned</p><p><code>monitor</code> - a progress monitor to track the clean progress</p><hr><h2><a name="method_getInstance">getInstance</a></h2><p><code>public org.eclipse.wst.xsl.core.XSLCore <strong>getInstance</strong>()</code></p><p>Get the singleton <code>XSLCore</code> instance.</p><h3>Returns</h3><p><code>org.eclipse.wst.xsl.core.XSLCore</code> - the <code>XSLCore</code> instance</p><hr><h2><a name="method_getStylesheet">getStylesheet</a></h2><p><code>public StylesheetModel <strong>getStylesheet</strong>(IFile file)</code></p><p>Get the cached stylesheet, or build it if it has not yet been built.</p><h3>Parameters</h3><p><code>file</code></p><h3>Returns</h3><p><code>StylesheetModel</code> - source file, or null if could not be built</p><hr><h2><a name="method_isXMLFile">isXMLFile</a></h2><p><code>public boolean <strong>isXMLFile</strong>(IFile file)</code></p><p>Determine whether the given file is an XML file by inspecting its content types.</p><h3>Parameters</h3><p><code>file</code> - the file to inspect</p><h3>Returns</h3><p><code>boolean</code> - true if this file is an XML file</p><hr><h2><a name="method_isXSLFile">isXSLFile</a></h2><p><code>public boolean <strong>isXSLFile</strong>(IFile file)</code></p><p>Determine whether the given file is an XSL file by inspecting its content types.</p><h3>Parameters</h3><p><code>file</code> - the file to inspect</p><h3>Returns</h3><p><code>boolean</code> - true if this file is an XSL file</p><hr><h2><a name="method_isXSLNamespace">isXSLNamespace</a></h2><p><code>public boolean <strong>isXSLNamespace</strong>(IDOMNode node)</code></p><p>Takes a given <code>IDOMNode</code> and returns whether it 
- is part of the the XSLT Namespace.</p><h3>Parameters</h3><p><code>node</code> - The IDOMNode to be checked.</p><h3>Returns</h3><p><code>boolean</code> - True if part of the XSLT namespace, false otherwise.</p><hr><h2><a name="method_resolveFile">resolveFile</a></h2><p><code>public IFile <strong>resolveFile</strong>(IFile currentFile
-         ,
-      java.lang.String uri)</code></p><p>Locates a file for the given current file and URI.</p><h3>Parameters</h3><p><code>currentFile</code> - the file to resolve relative to</p><p><code>uri</code> - the relative URI</p><h3>Returns</h3><p><code>IFile</code> - the file at the URI relative to this <code>currentFile</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.resolver.ResolverExtension.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.resolver.ResolverExtension.html
deleted file mode 100644
index c868c8a..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.resolver.ResolverExtension.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xsl.core.resolver</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xsl.core.resolver</strong></font><br>
-               Class ResolverExtension</h2><br><hr><pre>public class <strong>ResolverExtension</strong>
-extends java.lang.Object</pre>TODO: Javadoc<p></p><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_ResolverExtension">ResolverExtension</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.String</code></td><td width="" align="left"><code><a href="#method_resolve">resolve</a>(IFile file
-         ,
-      java.lang.String baseLocation
-         ,
-      java.lang.String publicId
-         ,
-      java.lang.String systemId)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_ResolverExtension">ResolverExtension</a></h2><p><code>public <strong>ResolverExtension</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_resolve">resolve</a></h2><p><code>public java.lang.String <strong>resolve</strong>(IFile file
-         ,
-      java.lang.String baseLocation
-         ,
-      java.lang.String publicId
-         ,
-      java.lang.String systemId)</code></p><p></p><h3>Parameters</h3><p><code>file</code></p><p><code>baseLocation</code></p><p><code>publicId</code></p><p><code>systemId</code></p><h3>Returns</h3><p><code>java.lang.String</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.resolver.XSLVersionHandler.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.resolver.XSLVersionHandler.html
deleted file mode 100644
index ac0f31a..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.core.resolver.XSLVersionHandler.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xsl.core.resolver</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xsl.core.resolver</strong></font><br>
-               Class XSLVersionHandler</h2><br><hr><pre>public class <strong>XSLVersionHandler</strong>
-extends org.xml.sax.helpers.DefaultHandler</pre>A simple XML parser to find the XSL version of a given XML file, expectedly a XSLT stylesheet.<hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XSLVersionHandler">XSLVersionHandler</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_comment">comment</a>(char[] ch
-         ,
-      int start
-         ,
-      int length)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_endCDATA">endCDATA</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_endDTD">endDTD</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_endEntity">endEntity</a>(java.lang.String name)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_error">error</a>(org.xml.sax.SAXParseException e)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_fatalError">fatalError</a>(org.xml.sax.SAXParseException e)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.String</code></td><td width="" align="left"><code><a href="#method_getVersionAttribute">getVersionAttribute</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add Javadoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public boolean</code></td><td width="" align="left"><code><a href="#method_parseContents">parseContents</a>(org.xml.sax.InputSource contents)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               TODO: Add Javadoc</td></tr><tr valign="top"><td width="20%" align="right"><code>public org.xml.sax.InputSource</code></td><td width="" align="left"><code><a href="#method_resolveEntity">resolveEntity</a>(java.lang.String publicId
-         ,
-      java.lang.String systemId)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_startCDATA">startCDATA</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_startDTD">startDTD</a>(java.lang.String name
-         ,
-      java.lang.String publicId
-         ,
-      java.lang.String systemId)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_startElement">startElement</a>(java.lang.String uri
-         ,
-      java.lang.String elementName
-         ,
-      java.lang.String qualifiedName
-         ,
-      org.xml.sax.Attributes attributes)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_startEntity">startEntity</a>(java.lang.String name)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_warning">warning</a>(org.xml.sax.SAXParseException e)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XSLVersionHandler">XSLVersionHandler</a></h2><p><code>public <strong>XSLVersionHandler</strong>()</code></p><p>TODO: Add Javadoc</p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_comment">comment</a></h2><p><code>public void <strong>comment</strong>(char[] ch
-         ,
-      int start
-         ,
-      int length)</code></p><p></p><h3>Parameters</h3><p><code>ch</code></p><p><code>start</code></p><p><code>length</code></p><hr><h2><a name="method_endCDATA">endCDATA</a></h2><p><code>public void <strong>endCDATA</strong>()</code></p><p></p><hr><h2><a name="method_endDTD">endDTD</a></h2><p><code>public void <strong>endDTD</strong>()</code></p><p></p><hr><h2><a name="method_endEntity">endEntity</a></h2><p><code>public void <strong>endEntity</strong>(java.lang.String name)</code></p><p></p><h3>Parameters</h3><p><code>name</code></p><hr><h2><a name="method_error">error</a></h2><p><code>public void <strong>error</strong>(org.xml.sax.SAXParseException e)</code></p><p></p><h3>Parameters</h3><p><code>e</code></p><h3>Throws:</h3><p><code>org.xml.sax.SAXException</code></p><hr><h2><a name="method_fatalError">fatalError</a></h2><p><code>public void <strong>fatalError</strong>(org.xml.sax.SAXParseException e)</code></p><p></p><h3>Parameters</h3><p><code>e</code></p><h3>Throws:</h3><p><code>org.xml.sax.SAXException</code></p><hr><h2><a name="method_getVersionAttribute">getVersionAttribute</a></h2><p><code>public java.lang.String <strong>getVersionAttribute</strong>()</code></p><p>TODO: Add Javadoc</p><h3>Returns</h3><p><code>java.lang.String</code></p><hr><h2><a name="method_parseContents">parseContents</a></h2><p><code>public boolean <strong>parseContents</strong>(org.xml.sax.InputSource contents)</code></p><p>TODO: Add Javadoc</p><h3>Parameters</h3><p><code>contents</code></p><h3>Returns</h3><p><code>boolean</code></p><h3>Throws:</h3><p><code>java.io.IOException</code></p><p><code>javax.xml.parsers.ParserConfigurationException</code></p><p><code>org.xml.sax.SAXException</code></p><hr><h2><a name="method_resolveEntity">resolveEntity</a></h2><p><code>public org.xml.sax.InputSource <strong>resolveEntity</strong>(java.lang.String publicId
-         ,
-      java.lang.String systemId)</code></p><p></p><h3>Parameters</h3><p><code>publicId</code></p><p><code>systemId</code></p><h3>Returns</h3><p><code>org.xml.sax.InputSource</code></p><h3>Throws:</h3><p><code>org.xml.sax.SAXException</code></p><hr><h2><a name="method_startCDATA">startCDATA</a></h2><p><code>public void <strong>startCDATA</strong>()</code></p><p></p><hr><h2><a name="method_startDTD">startDTD</a></h2><p><code>public void <strong>startDTD</strong>(java.lang.String name
-         ,
-      java.lang.String publicId
-         ,
-      java.lang.String systemId)</code></p><p></p><h3>Parameters</h3><p><code>name</code></p><p><code>publicId</code></p><p><code>systemId</code></p><h3>Throws:</h3><p><code>org.xml.sax.SAXException</code></p><hr><h2><a name="method_startElement">startElement</a></h2><p><code>public void <strong>startElement</strong>(java.lang.String uri
-         ,
-      java.lang.String elementName
-         ,
-      java.lang.String qualifiedName
-         ,
-      org.xml.sax.Attributes attributes)</code></p><p></p><h3>Parameters</h3><p><code>uri</code></p><p><code>elementName</code></p><p><code>qualifiedName</code></p><p><code>attributes</code></p><h3>Throws:</h3><p><code>org.xml.sax.SAXException</code></p><hr><h2><a name="method_startEntity">startEntity</a></h2><p><code>public void <strong>startEntity</strong>(java.lang.String name)</code></p><p></p><h3>Parameters</h3><p><code>name</code></p><hr><h2><a name="method_warning">warning</a></h2><p><code>public void <strong>warning</strong>(org.xml.sax.SAXParseException e)</code></p><p></p><h3>Parameters</h3><p><code>e</code></p><h3>Throws:</h3><p><code>org.xml.sax.SAXException</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanDebugger.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanDebugger.html
deleted file mode 100644
index c3bc9cc..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanDebugger.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xsl.xalan.debugger</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xsl.xalan.debugger</strong></font><br>
-               Class XalanDebugger</h2><br><hr><pre>public class <strong>XalanDebugger</strong>
-extends AbstractDebugger</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XalanDebugger">XalanDebugger</a></strong>()</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_addTransformer">addTransformer</a>(javax.xml.transform.Transformer transformer)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_debuggerSuspended">debuggerSuspended</a>(BreakPoint breakpoint)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public Variable</code></td><td width="" align="left"><code><a href="#method_getVariable">getVariable</a>(int id)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>package-private void</code></td><td width="" align="left"><code><a href="#method_setCurrentTraceListener">setCurrentTraceListener</a>(org.eclipse.wst.xsl.xalan.debugger.XalanTraceListener currentTraceListener)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_setTransformerFactory">setTransformerFactory</a>(javax.xml.transform.TransformerFactory factory)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XalanDebugger">XalanDebugger</a></h2><p><code>public <strong>XalanDebugger</strong>()</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_addTransformer">addTransformer</a></h2><p><code>public void <strong>addTransformer</strong>(javax.xml.transform.Transformer transformer)</code></p><p></p><h3>Parameters</h3><p><code>transformer</code></p><hr><h2><a name="method_debuggerSuspended">debuggerSuspended</a></h2><p><code>public void <strong>debuggerSuspended</strong>(BreakPoint breakpoint)</code></p><p></p><h3>Parameters</h3><p><code>breakpoint</code></p><hr><h2><a name="method_getVariable">getVariable</a></h2><p><code>public Variable <strong>getVariable</strong>(int id)</code></p><p></p><h3>Parameters</h3><p><code>id</code></p><h3>Returns</h3><p><code>Variable</code></p><hr><h2><a name="method_setCurrentTraceListener">setCurrentTraceListener</a></h2><p><code>package-private void <strong>setCurrentTraceListener</strong>(org.eclipse.wst.xsl.xalan.debugger.XalanTraceListener currentTraceListener)</code></p><p></p><h3>Parameters</h3><p><code>currentTraceListener</code></p><hr><h2><a name="method_setTransformerFactory">setTransformerFactory</a></h2><p><code>public void <strong>setTransformerFactory</strong>(javax.xml.transform.TransformerFactory factory)</code></p><p></p><h3>Parameters</h3><p><code>factory</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanPrintTraceListener.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanPrintTraceListener.html
deleted file mode 100644
index 916f411..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanPrintTraceListener.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xsl.xalan.debugger</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xsl.xalan.debugger</strong></font><br>
-               Class XalanPrintTraceListener</h2><br><hr><pre>public class <strong>XalanPrintTraceListener</strong>
-extends PrintTraceListener</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XalanPrintTraceListener">XalanPrintTraceListener</a></strong>(java.io.PrintWriter pw)</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method__trace">_trace</a>(TracerEvent ev)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_selected">selected</a>(SelectionEvent ev)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_selectEnd">selectEnd</a>(EndSelectionEvent ev)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_trace">trace</a>(TracerEvent ev)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_traceEnd">traceEnd</a>(TracerEvent ev)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XalanPrintTraceListener">XalanPrintTraceListener</a></h2><p><code>public <strong>XalanPrintTraceListener</strong>(java.io.PrintWriter pw)</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method__trace">_trace</a></h2><p><code>public void <strong>_trace</strong>(TracerEvent ev)</code></p><p></p><h3>Parameters</h3><p><code>ev</code></p><hr><h2><a name="method_selected">selected</a></h2><p><code>public void <strong>selected</strong>(SelectionEvent ev)</code></p><p></p><h3>Parameters</h3><p><code>ev</code></p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_selectEnd">selectEnd</a></h2><p><code>public void <strong>selectEnd</strong>(EndSelectionEvent ev)</code></p><p></p><h3>Parameters</h3><p><code>ev</code></p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_trace">trace</a></h2><p><code>public void <strong>trace</strong>(TracerEvent ev)</code></p><p></p><h3>Parameters</h3><p><code>ev</code></p><hr><h2><a name="method_traceEnd">traceEnd</a></h2><p><code>public void <strong>traceEnd</strong>(TracerEvent ev)</code></p><p></p><h3>Parameters</h3><p><code>ev</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanRootStyleFrame.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanRootStyleFrame.html
deleted file mode 100644
index e15cacf..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanRootStyleFrame.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xsl.xalan.debugger</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xsl.xalan.debugger</strong></font><br>
-               Class XalanRootStyleFrame</h2><br><hr><pre>public class <strong>XalanRootStyleFrame</strong>
-extends org.eclipse.wst.xsl.xalan.debugger.XalanStyleFrame</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XalanRootStyleFrame">XalanRootStyleFrame</a></strong>(TracerEvent event)</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_addVariable">addVariable</a>(org.eclipse.wst.xsl.xalan.debugger.XalanVariable xvar)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>protected java.util.List</code></td><td width="" align="left"><code><a href="#method_getGlobals">getGlobals</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public Variable</code></td><td width="" align="left"><code><a href="#method_getVariable">getVariable</a>(int id)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XalanRootStyleFrame">XalanRootStyleFrame</a></h2><p><code>public <strong>XalanRootStyleFrame</strong>(TracerEvent event)</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_addVariable">addVariable</a></h2><p><code>public void <strong>addVariable</strong>(org.eclipse.wst.xsl.xalan.debugger.XalanVariable xvar)</code></p><p></p><h3>Parameters</h3><p><code>xvar</code></p><hr><h2><a name="method_getGlobals">getGlobals</a></h2><p><code>protected java.util.List <strong>getGlobals</strong>()</code></p><p></p><h3>Returns</h3><p><code>java.util.List</code></p><hr><h2><a name="method_getVariable">getVariable</a></h2><p><code>public Variable <strong>getVariable</strong>(int id)</code></p><p></p><h3>Parameters</h3><p><code>id</code></p><h3>Returns</h3><p><code>Variable</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanStyleFrame.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanStyleFrame.html
deleted file mode 100644
index a756d3e..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanStyleFrame.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xsl.xalan.debugger</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xsl.xalan.debugger</strong></font><br>
-               Class XalanStyleFrame</h2><br><hr><pre>public class <strong>XalanStyleFrame</strong>
-extends StyleFrame</pre><hr><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Field Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>package-private TracerEvent</code></td><td width="80%" align="left"><code><a href="#field_event">event</a></code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><br><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XalanStyleFrame">XalanStyleFrame</a></strong>(StyleFrame parent
-         ,
-      TracerEvent event)</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public int</code></td><td width="" align="left"><code><a href="#method_getCurrentLine">getCurrentLine</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.String</code></td><td width="" align="left"><code><a href="#method_getFilename">getFilename</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>protected java.util.List</code></td><td width="" align="left"><code><a href="#method_getGlobals">getGlobals</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.String</code></td><td width="" align="left"><code><a href="#method_getName">getName</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public int</code></td><td width="" align="left"><code><a href="#method_getSourceCurrentLine">getSourceCurrentLine</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.String</code></td><td width="" align="left"><code><a href="#method_getSourceFilename">getSourceFilename</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.util.List</code></td><td width="" align="left"><code><a href="#method_getVariableStack">getVariableStack</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public TracerEvent</code></td><td width="" align="left"><code><a href="#method_peekElement">peekElement</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public TracerEvent</code></td><td width="" align="left"><code><a href="#method_popElement">popElement</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_pushElement">pushElement</a>(TracerEvent e)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Field Detail
-               </h2></td></tr></table><h2><a name="field_event">event</a></h2><p><code>package-private TracerEvent <strong>event</strong></code></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XalanStyleFrame">XalanStyleFrame</a></h2><p><code>public <strong>XalanStyleFrame</strong>(StyleFrame parent
-         ,
-      TracerEvent event)</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_getCurrentLine">getCurrentLine</a></h2><p><code>public int <strong>getCurrentLine</strong>()</code></p><p></p><h3>Returns</h3><p><code>int</code></p><hr><h2><a name="method_getFilename">getFilename</a></h2><p><code>public java.lang.String <strong>getFilename</strong>()</code></p><p></p><h3>Returns</h3><p><code>java.lang.String</code></p><hr><h2><a name="method_getGlobals">getGlobals</a></h2><p><code>protected java.util.List <strong>getGlobals</strong>()</code></p><p></p><h3>Returns</h3><p><code>java.util.List</code></p><hr><h2><a name="method_getName">getName</a></h2><p><code>public java.lang.String <strong>getName</strong>()</code></p><p></p><h3>Returns</h3><p><code>java.lang.String</code></p><hr><h2><a name="method_getSourceCurrentLine">getSourceCurrentLine</a></h2><p><code>public int <strong>getSourceCurrentLine</strong>()</code></p><p></p><h3>Returns</h3><p><code>int</code></p><hr><h2><a name="method_getSourceFilename">getSourceFilename</a></h2><p><code>public java.lang.String <strong>getSourceFilename</strong>()</code></p><p></p><h3>Returns</h3><p><code>java.lang.String</code></p><hr><h2><a name="method_getVariableStack">getVariableStack</a></h2><p><code>public java.util.List <strong>getVariableStack</strong>()</code></p><p></p><h3>Returns</h3><p><code>java.util.List</code></p><hr><h2><a name="method_peekElement">peekElement</a></h2><p><code>public TracerEvent <strong>peekElement</strong>()</code></p><p></p><h3>Returns</h3><p><code>TracerEvent</code></p><hr><h2><a name="method_popElement">popElement</a></h2><p><code>public TracerEvent <strong>popElement</strong>()</code></p><p></p><h3>Returns</h3><p><code>TracerEvent</code></p><hr><h2><a name="method_pushElement">pushElement</a></h2><p><code>public void <strong>pushElement</strong>(TracerEvent e)</code></p><p></p><h3>Parameters</h3><p><code>e</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanTraceListener.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanTraceListener.html
deleted file mode 100644
index 9e5bb26..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanTraceListener.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xsl.xalan.debugger</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xsl.xalan.debugger</strong></font><br>
-               Class XalanTraceListener</h2><br><hr><pre>public class <strong>XalanTraceListener</strong>
-extends java.lang.Object</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XalanTraceListener">XalanTraceListener</a></strong>(org.eclipse.wst.xsl.xalan.debugger.XalanDebugger debugger)</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_extension">extension</a>(ExtensionEvent ee)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_extensionEnd">extensionEnd</a>(ExtensionEvent ee)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_generated">generated</a>(GenerateEvent ev)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public Variable</code></td><td width="" align="left"><code><a href="#method_getVariable">getVariable</a>(int id)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_selected">selected</a>(SelectionEvent ev)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_selectEnd">selectEnd</a>(EndSelectionEvent ev)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_trace">trace</a>(TracerEvent ev)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public void</code></td><td width="" align="left"><code><a href="#method_traceEnd">traceEnd</a>(TracerEvent ev)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XalanTraceListener">XalanTraceListener</a></h2><p><code>public <strong>XalanTraceListener</strong>(org.eclipse.wst.xsl.xalan.debugger.XalanDebugger debugger)</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_extension">extension</a></h2><p><code>public void <strong>extension</strong>(ExtensionEvent ee)</code></p><p></p><h3>Parameters</h3><p><code>ee</code></p><hr><h2><a name="method_extensionEnd">extensionEnd</a></h2><p><code>public void <strong>extensionEnd</strong>(ExtensionEvent ee)</code></p><p></p><h3>Parameters</h3><p><code>ee</code></p><hr><h2><a name="method_generated">generated</a></h2><p><code>public void <strong>generated</strong>(GenerateEvent ev)</code></p><p></p><h3>Parameters</h3><p><code>ev</code></p><hr><h2><a name="method_getVariable">getVariable</a></h2><p><code>public Variable <strong>getVariable</strong>(int id)</code></p><p></p><h3>Parameters</h3><p><code>id</code></p><h3>Returns</h3><p><code>Variable</code></p><hr><h2><a name="method_selected">selected</a></h2><p><code>public void <strong>selected</strong>(SelectionEvent ev)</code></p><p></p><h3>Parameters</h3><p><code>ev</code></p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_selectEnd">selectEnd</a></h2><p><code>public void <strong>selectEnd</strong>(EndSelectionEvent ev)</code></p><p></p><h3>Parameters</h3><p><code>ev</code></p><h3>Throws:</h3><p><code>javax.xml.transform.TransformerException</code></p><hr><h2><a name="method_trace">trace</a></h2><p><code>public void <strong>trace</strong>(TracerEvent ev)</code></p><p></p><h3>Parameters</h3><p><code>ev</code></p><hr><h2><a name="method_traceEnd">traceEnd</a></h2><p><code>public void <strong>traceEnd</strong>(TracerEvent ev)</code></p><p></p><h3>Parameters</h3><p><code>ev</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanVariable.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanVariable.html
deleted file mode 100644
index e96a818..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanVariable.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html><body><p><font size="+1"><strong>Package org.eclipse.wst.xsl.xalan.debugger</strong></font></p><hr><h2><font size="-1"><strong>org.eclipse.wst.xsl.xalan.debugger</strong></font><br>
-               Class XalanVariable</h2><br><hr><pre>public class <strong>XalanVariable</strong>
-extends Variable</pre><hr><table width="100%" border="1"><tr bgcolor="#CCCCFF"><td width="100%"><h2>Constructor Summary</h2></td></tr><tr><td><code><strong><a href="#con_XalanVariable">XalanVariable</a></strong>(org.eclipse.wst.xsl.xalan.debugger.XalanStyleFrame xalanStyleFrame
-         ,
-      VariableStack varStack
-         ,
-      java.lang.String scope
-         ,
-      int slotNumber
-         ,
-      ElemVariable elemVariable)</code></td></tr></table><br><table width="100%" border="1"><tr cols="2" bgcolor="#CCCCFF"><td colspan="2" width="100%"><h2>Method Summary</h2></td></tr><tr valign="top"><td width="20%" align="right"><code>public int</code></td><td width="" align="left"><code><a href="#method_compareTo">compareTo</a>(java.lang.Object arg0)</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.String</code></td><td width="" align="left"><code><a href="#method_getType">getType</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr><tr valign="top"><td width="20%" align="right"><code>public java.lang.String</code></td><td width="" align="left"><code><a href="#method_getValue">getValue</a>()</code><br>
-               &nbsp;&nbsp;&nbsp;&nbsp;
-               </td></tr></table><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Constructor Detail
-               </h2></td></tr></table><h2><a name="con_XalanVariable">XalanVariable</a></h2><p><code>public <strong>XalanVariable</strong>(org.eclipse.wst.xsl.xalan.debugger.XalanStyleFrame xalanStyleFrame
-         ,
-      VariableStack varStack
-         ,
-      java.lang.String scope
-         ,
-      int slotNumber
-         ,
-      ElemVariable elemVariable)</code></p><p></p><hr><table cols="2" width="100%" border="1"><tr colspan="2" width="100%" bgcolor="#CCCCFF" align="left"><td><h2>
-                  Methods Detail
-               </h2></td></tr></table><h2><a name="method_compareTo">compareTo</a></h2><p><code>public int <strong>compareTo</strong>(java.lang.Object arg0)</code></p><p></p><h3>Parameters</h3><p><code>arg0</code></p><h3>Returns</h3><p><code>int</code></p><hr><h2><a name="method_getType">getType</a></h2><p><code>public java.lang.String <strong>getType</strong>()</code></p><p></p><h3>Returns</h3><p><code>java.lang.String</code></p><hr><h2><a name="method_getValue">getValue</a></h2><p><code>public java.lang.String <strong>getValue</strong>()</code></p><p></p><h3>Returns</h3><p><code>java.lang.String</code></p><hr></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/toc.html b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/toc.html
deleted file mode 100644
index 326f0a9..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/html/toc.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>Table of Contents</title>
-</head>
-
-<body>
-<h1>Table of Contents</h1>
-Please enter your text here.
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/jeltohtml.xsl b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/jeltohtml.xsl
deleted file mode 100644
index 34af00f..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/jeltohtml.xsl
+++ /dev/null
@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * 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 - bug 231472 - initial API and implementation
- *******************************************************************************/
-
- -->
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:redirect="http://xml.apache.org/xalan/redirect"
-                extension-element-prefixes="redirect">
-    <xsl:output encoding="UTF-8" method="html" indent="no" omit-xml-declaration="yes"/>
-    
-    <!-- Create the HTML structure -->
-	<xsl:template match="/">
-   		<xsl:apply-templates select="//jelclass"/>
-	</xsl:template>
-   
-    <!-- This is the main work horse that does the general layout for the class page -->
-    <xsl:template match="jelclass">
-      <xsl:variable name="outputFile">
-        <xsl:value-of select="@fulltype"/>
-        <xsl:text>.html</xsl:text>
-      </xsl:variable>
-      <xsl:message terminate="no">
-         <xsl:text>Generating JavaDoc for </xsl:text>
-         <xsl:value-of select="@fulltype"/>
-         <xsl:text>.</xsl:text>
-      </xsl:message>
-      <redirect:write select="$outputFile">
-       <html>
-         <body>
-            <p>
-               <font size="+1"><strong>Package <xsl:value-of select="@package"/></strong></font>
-            </p>
-            <hr/>
-            <h2>
-               <font size="-1"><strong><xsl:value-of select="@package"/></strong></font><br/>
-               Class <xsl:value-of select="@type"/>
-            </h2>
-            <br/>
-            <hr/>
-            <xsl:call-template name="format-header"/>
-            <xsl:apply-templates select="comment/description"/>
-            <xsl:apply-templates select="comment/attribute"/>
-            <hr/>
-            <xsl:if test="descendant::fields">
-               <table border="1" width="100%">
-                  <tr bgcolor="#CCCCFF" cols="2">
-                     <td width="100%" colspan="2"><h2>Field Summary</h2></td>
-                  </tr>
-                  <xsl:apply-templates select="fields/field" mode="summary">
-                     <xsl:sort select="@name" order="ascending"/>
-                  </xsl:apply-templates>
-               </table>
-               <br/>
-            </xsl:if>
-            <xsl:if test="descendant::constructor">
-               <table border="1" width="100%">
-                  <tr bgcolor="#CCCCFF">
-                     <td width="100%"><h2>Constructor Summary</h2></td>
-                  </tr>
-                  <xsl:apply-templates select="descendant::constructor" mode="summary">
-                     <xsl:sort select="@name" order="ascending"/>
-                  </xsl:apply-templates>
-               </table>
-               <br/>
-            </xsl:if>
-            <xsl:if test="descendant::methods">
-               <table border="1" width="100%">
-                  <tr bgcolor="#CCCCFF" cols="2">
-                     <td width="100%" colspan="2"><h2>Method Summary</h2></td>
-                  </tr>
-                  <xsl:apply-templates select="methods/method" mode="summary">
-                     <xsl:sort select="@name" order="ascending"/>
-                  </xsl:apply-templates>
-               </table>
-            </xsl:if>
-            <hr/>
-            <xsl:if test="fields">
-               <xsl:call-template name="fieldDetail"/>
-            </xsl:if>
-            <xsl:if test="methods/constructor">
-               <xsl:call-template name="constructorDetail"/>
-            </xsl:if>
-            <xsl:if test="methods/method">
-               <xsl:call-template name="methodsDetail"/>
-            </xsl:if>
-           </body>
-         </html>
-      </redirect:write>
-    </xsl:template>
-    
-    <!-- Output any description that may be there for comments. -->
-    <xsl:template match="comment/description">
-            <xsl:value-of select="." disable-output-escaping="yes"/>
-    </xsl:template>
-    
-    <!-- Output the various attribute information for the class -->
-    <xsl:template match="comment/attribute">
-         <p>
-            <xsl:choose>
-               <xsl:when test="@author">
-                  <strong>Author:</strong><br/>
-                  <xsl:value-of select="description" disable-output-escaping="yes"/> 
-               </xsl:when>
-               <xsl:when test="@see">
-                  <strong>See Also:</strong><br/>
-                     <xsl:value-of select="description" disable-output-escaping="yes"/>
-               </xsl:when>
-            </xsl:choose>
-         </p>
-    </xsl:template>
-
-
-        <!-- Create the field summary rows -->
-    <xsl:template match="field" mode="summary">
-         <tr valign="top">
-            <td align="right" width="20%">
-               <code>
-                  <xsl:value-of select="@visibility"/>
-                  <xsl:if test="@static = 'true'">
-                     <xsl:text> static </xsl:text>
-                  </xsl:if>
-                  <xsl:text> </xsl:text>
-                  <xsl:value-of select="@fulltype"/>                     
-               </code>
-            </td>
-            <td align="left" width="80%">
-               <code>
-                  <a href="#field_{@name}">
-                  <xsl:value-of select="@name"/>
-                  </a>
-               </code>
-               <br/>
-               &#160;&#160;&#160;&#160;
-               <xsl:value-of select="comment/description"/>
-            </td>
-         </tr>
-    </xsl:template>
-    
-    
-    <!-- Create the constructors rows -->
-    <xsl:template match="constructor" mode="summary">
-         <tr>
-            <td>
-               <code>
-                  <strong>
-                    <a href="#con_{@name}">
-                     <xsl:value-of select="@name"/>
-                    </a>
-                  </strong>                     
-                  <xsl:text>(</xsl:text>
-                  <xsl:if test="params">
-                     <xsl:apply-templates select="params/param"/>
-                  </xsl:if>
-                  <xsl:text>)</xsl:text>
-               </code>
-            </td>
-         </tr>
-    </xsl:template>
-    
-    
-    <xsl:template match="param">
-      <xsl:value-of select="@fulltype"/><xsl:text> </xsl:text><xsl:value-of select="@name"/>
-      <xsl:if test="position() != last()">
-         ,
-      </xsl:if>
-    </xsl:template>
-    
-    <!-- Create the method summary rows -->
-    <xsl:template match="method" mode="summary">
-         <tr valign="top">
-            <td align="right" width="20%">
-               <code>
-                  <xsl:value-of select="@visibility"/>
-                  <xsl:if test="@static = 'true'">
-                     <xsl:text> static</xsl:text>
-                  </xsl:if>
-                  <xsl:text> </xsl:text>
-                  <xsl:value-of select="@fulltype"/>                     
-               </code>
-            </td>
-            <td align="left" width="">
-               <code>
-                  <a href="#method_{@name}">
-                  <xsl:value-of select="@name"/>
-                  </a>
-                  <xsl:text>(</xsl:text>
-                  <xsl:if test="params">
-                     <xsl:apply-templates select="params/param"/>
-                  </xsl:if>
-                  <xsl:text>)</xsl:text>
-               </code>
-               <br/>
-               &#160;&#160;&#160;&#160;
-               <xsl:apply-templates select="comment/description"/>
-            </td>
-         </tr>
-    </xsl:template>
-    
-    
-    <xsl:template name="format-header">
-         <pre>
-<xsl:value-of select="@visibility"/> class <strong><xsl:value-of select="@type"/></strong>
-extends <xsl:value-of select="@superclassfulltype"/>
-         </pre>
-    </xsl:template>
-    
-    <xsl:template name="fieldDetail">
-      <table border="1" width="100%" cols="2">
-         <tr align="left" bgcolor="#CCCCFF" width="100%" colspan="2">
-            <td>
-               <h2>
-                  Field Detail
-               </h2>
-            </td>
-         </tr>
-      </table>
-      <xsl:apply-templates select="fields/field" mode="detail">
-         <xsl:sort select="@name" order="ascending"/>
-      </xsl:apply-templates>
-    </xsl:template>
-    
-    <xsl:template match="fields/field" mode="detail">
-      <h2>
-         <a name="field_{@name}">
-            <xsl:value-of select="@name"/>
-         </a>
-      </h2>
-      <p>
-         <code>
-            <xsl:value-of select="@visibility"/>
-            <xsl:if test="@static = 'true'">
-               <xsl:text> static </xsl:text>
-            </xsl:if>
-            <xsl:text> </xsl:text>
-            <xsl:value-of select="@fulltype"/>
-            <xsl:text> </xsl:text>
-            <strong>
-               <xsl:value-of select="@name"/>
-            </strong>                   
-         </code>
-      </p>
-      <xsl:if test="comment">
-         <table>
-            <tr>
-              <td>
-                  <xsl:apply-templates select="comment/description"/>
-              </td>
-            </tr>
-         </table>
-      </xsl:if>
-      <hr/>
-      
-    </xsl:template>
-    
-    <xsl:template name="constructorDetail">
-      <table border="1" width="100%" cols="2">
-         <tr align="left" bgcolor="#CCCCFF" width="100%" colspan="2">
-            <td>
-               <h2>
-                  Constructor Detail
-               </h2>
-            </td>
-         </tr>
-      </table>
-      <xsl:apply-templates select="methods/constructor" mode="detail">
-         <xsl:sort select="@name" order="ascending"/>
-      </xsl:apply-templates>
-    </xsl:template>
-    
-    <xsl:template match="methods/constructor" mode="detail">
-      <h2>
-         <a name="con_{@name}"><xsl:value-of select="@name"/></a>
-      </h2>
-      <p>
-         <code>
-            <xsl:value-of select="@visibility"/>
-            <xsl:text> </xsl:text>
-            <strong>
-               <xsl:value-of select="@name"/>
-            </strong>
-            <xsl:text>(</xsl:text>
-            <xsl:if test="params">
-               <xsl:apply-templates select="params/param"/>
-            </xsl:if>
-            <xsl:text>)</xsl:text>
-         </code>
-      </p>
-      <p>
-         <xsl:apply-templates select="comment/description"/>
-      </p>
-      <hr/>
-      
-    </xsl:template>
-    
-    <xsl:template name="methodsDetail">
-      <table border="1" width="100%" cols="2">
-         <tr align="left" bgcolor="#CCCCFF" width="100%" colspan="2">
-            <td>
-               <h2>
-                  Methods Detail
-               </h2>
-            </td>
-         </tr>
-      </table>
-      <xsl:apply-templates select="methods/method" mode="detail">
-         <xsl:sort select="@name" order="ascending"/>
-      </xsl:apply-templates>
-    </xsl:template>
-    
-    <xsl:template match="methods/method" mode="detail">
-      <h2>
-         <a name="method_{@name}">
-            <xsl:value-of select="@name"/>
-         </a>
-      </h2>
-      <p>
-         <code>
-            <xsl:value-of select="@visibility"/>
-            <xsl:text> </xsl:text>
-            <xsl:value-of select="@fulltype"/>
-            <xsl:text> </xsl:text>
-            <strong>
-               <xsl:value-of select="@name"/>
-            </strong>
-            <xsl:text>(</xsl:text>
-            <xsl:if test="params">
-               <xsl:apply-templates select="params/param"/>
-            </xsl:if>
-            <xsl:text>)</xsl:text>
-         </code>
-      </p>
-      <p>
-         <xsl:apply-templates select="comment/description"/>
-      </p>
-      <xsl:if test="params">
-         <h3>Parameters</h3>
-         <xsl:apply-templates select="params/param" mode="detail"/>
-      </xsl:if>
-      <xsl:if test="@type != 'void'">
-         <h3>Returns</h3>
-            <p>
-               <code>
-                  <xsl:value-of select="@fulltype"/>
-               </code>
-               <xsl:if test="string-length(@returncomment) > 0">
-                  <xsl:text> - </xsl:text>
-                  <xsl:value-of select="@returncomment" disable-output-escaping="yes"/>
-               </xsl:if>
-            </p>
-      </xsl:if>
-      <xsl:if test="exceptions">
-         <h3>Throws:</h3>
-         <xsl:apply-templates select="exceptions/exception" mode="detail"/>
-      </xsl:if>
-      <hr/>
-      
-    </xsl:template>
-    
-    <xsl:template match="param" mode="detail">
-         <p>
-            <code>
-               <xsl:value-of select="@name"/>
-            </code>
-            <xsl:if test="string-length(@comment) > 0">
-               <xsl:text> - </xsl:text>
-               <xsl:value-of select="@comment" disable-output-escaping="yes"/>
-            </xsl:if>
-         </p>
-    </xsl:template>
-    
-    <xsl:template match="exception" mode="detail">
-      <p>
-         <code>
-            <xsl:value-of select="@fulltype"/>
-            <xsl:if test="string-length(@comment) > 0">
-               <xsl:text> - </xsl:text>
-               <xsl:value-of select="@comment" disable-output-escaping="yes"/>
-            </xsl:if>
-         </code>
-      </p>
-    </xsl:template>
-       
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/jeltotoc.xsl b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/jeltotoc.xsl
deleted file mode 100644
index 38f5082..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/jeltotoc.xsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * 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 - bug 231472 - initial API and implementation
- *******************************************************************************/
- -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:set="http://exslt.org/sets"
-   xmlns:xalan="http://xml.apache.org/xalan"
-    exclude-result-prefixes="set xalan"
->
-   <xsl:param name="sdkname">Some Name</xsl:param>
-   <xsl:param name="dir">doc/html</xsl:param>   
-   <xsl:output indent="yes" encoding="UTF-8" xalan:indent-amount="3"/>
-   <xsl:key name="allPackages" match="jelclass" use="@package"/>
-     
-   <xsl:template match="/jel">
-      <toc label="{$sdkname}">
-         <topic label="Reference">
-            <xsl:for-each select="set:distinct(jelclass/@package)">
-               <topic label="{.}">
-                  <xsl:apply-templates select="key('allPackages', .)"/>
-               </topic>
-            </xsl:for-each>
-         </topic>
-      </toc>
-   </xsl:template>
-   
-   <xsl:template match="jelclass">
-      <topic label="{@fulltype}" href="{$dir}/{@fulltype}.html"/>
-   </xsl:template>
-   
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/schema.css b/docs/org.eclipse.wst.xsl.sdk.documentation/doc/schema.css
deleted file mode 100644
index fb2028d..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/doc/schema.css
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-H6.SchemaHeader {
-	font-size:16px; 
-	display:inline
-}
-
-P.SchemaCopyright {
-	font-size: smaller; 
-	font-style: normal;
-	color: #336699; 
-	display:inline;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-}
-
-P.SchemaDtd {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-P.SchemaDtdAttlist {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 20.000000pt;
-}
-
-span.SchemaTag {
-	color: #000080;
-}
-
-span.SchemaCstring {
-	color: #008000;
-}
-
-pre.Example {
-	margin-top: 0.000000pt;
-}
-
-.ConfigMarkupElementDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-.ConfigMarkupAttlistDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 32.000000pt;
-}
-
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/lib/.cvsignore b/docs/org.eclipse.wst.xsl.sdk.documentation/lib/.cvsignore
deleted file mode 100644
index f38f5da..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/lib/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-jeldoclet.jar
-doccheck.jar
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/plugin.properties b/docs/org.eclipse.wst.xsl.sdk.documentation/plugin.properties
deleted file mode 100644
index 78a6a47..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2005-2007 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 215126, 213853
-#     
-###############################################################################
-
-providerName=Eclipse.org
-pluginName=XSL SDK Documentation (Incubating)
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/plugin.xml b/docs/org.eclipse.wst.xsl.sdk.documentation/plugin.xml
deleted file mode 100644
index 1427912..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="toc.xml"
-            primary="true">
-      </toc>
-   </extension>
-
-</plugin>
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/src/org/eclipse/wst/xsl/sdk/documentation/Activator.java b/docs/org.eclipse.wst.xsl.sdk.documentation/src/org/eclipse/wst/xsl/sdk/documentation/Activator.java
deleted file mode 100644
index 984e411..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/src/org/eclipse/wst/xsl/sdk/documentation/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.wst.xsl.sdk.documentation;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.xsl.sdk.documentation";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/toc.xml b/docs/org.eclipse.wst.xsl.sdk.documentation/toc.xml
deleted file mode 100644
index 1d6564b..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/toc.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><toc xmlns:xalan="http://xml.apache.org/xalan" label="XSL Tools SDK Documentation">
-   <topic label="Reference">
-      <topic label="org.eclipse.wst.xml.xpath.core">
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.core.XPathCorePlugin.html" label="org.eclipse.wst.xml.xpath.core.XPathCorePlugin"/>
-      </topic>
-      <topic label="org.eclipse.wst.xml.xpath.core.util">
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper.html" label="org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper"/>
-      </topic>
-      <topic label="org.eclipse.wst.xml.xpath.ui">
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.XPathUIMessages.html" label="org.eclipse.wst.xml.xpath.ui.XPathUIMessages"/>
-      </topic>
-      <topic label="org.eclipse.wst.xml.xpath.ui.views">
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMNodeLabelProvider.html" label="org.eclipse.wst.xml.xpath.ui.views.DOMNodeLabelProvider"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMTreeContentProvider.html" label="org.eclipse.wst.xml.xpath.ui.views.DOMTreeContentProvider"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.DOMViewerFilter.html" label="org.eclipse.wst.xml.xpath.ui.views.DOMViewerFilter"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.EditNamespacePrefixDialog.html" label="org.eclipse.wst.xml.xpath.ui.views.EditNamespacePrefixDialog"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.html" label="org.eclipse.wst.xml.xpath.ui.views.XPathNavigator"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XPathAction.html" label="org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XPathAction"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.RefreshAction.html" label="org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.RefreshAction"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.ShowInSourceAction.html" label="org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.ShowInSourceAction"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XMLEditorsContentProvider.html" label="org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XMLEditorsContentProvider"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.EditorReferenceLabelProvider.html" label="org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.EditorReferenceLabelProvider"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XPathAction.html" label="org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XPathAction"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.RefreshAction.html" label="org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.RefreshAction"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.ShowInSourceAction.html" label="org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.ShowInSourceAction"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XMLEditorsContentProvider.html" label="org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.XMLEditorsContentProvider"/>
-         <topic href="doc/html/org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.EditorReferenceLabelProvider.html" label="org.eclipse.wst.xml.xpath.ui.views.XPathNavigator.EditorReferenceLabelProvider"/>
-      </topic>
-      <topic label="org.eclipse.wst.xsl.core">
-         <topic href="doc/html/org.eclipse.wst.xsl.core.Messages.html" label="org.eclipse.wst.xsl.core.Messages"/>
-         <topic href="doc/html/org.eclipse.wst.xsl.core.ValidationPreferences.html" label="org.eclipse.wst.xsl.core.ValidationPreferences"/>
-         <topic href="doc/html/org.eclipse.wst.xsl.core.XSLCore.html" label="org.eclipse.wst.xsl.core.XSLCore"/>
-      </topic>
-      <topic label="org.eclipse.wst.xsl.core.resolver">
-         <topic href="doc/html/org.eclipse.wst.xsl.core.resolver.ResolverExtension.html" label="org.eclipse.wst.xsl.core.resolver.ResolverExtension"/>
-         <topic href="doc/html/org.eclipse.wst.xsl.core.resolver.XSLVersionHandler.html" label="org.eclipse.wst.xsl.core.resolver.XSLVersionHandler"/>
-      </topic>
-      <topic label="org.eclipse.wst.xsl.xalan.debugger">
-         <topic href="doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanDebugger.html" label="org.eclipse.wst.xsl.xalan.debugger.XalanDebugger"/>
-         <topic href="doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanPrintTraceListener.html" label="org.eclipse.wst.xsl.xalan.debugger.XalanPrintTraceListener"/>
-         <topic href="doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanRootStyleFrame.html" label="org.eclipse.wst.xsl.xalan.debugger.XalanRootStyleFrame"/>
-         <topic href="doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanStyleFrame.html" label="org.eclipse.wst.xsl.xalan.debugger.XalanStyleFrame"/>
-         <topic href="doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanTraceListener.html" label="org.eclipse.wst.xsl.xalan.debugger.XalanTraceListener"/>
-         <topic href="doc/html/org.eclipse.wst.xsl.xalan.debugger.XalanVariable.html" label="org.eclipse.wst.xsl.xalan.debugger.XalanVariable"/>
-      </topic>
-   </topic>
-   <topic label="Extension Points">
-	   <topic label="JAXP Debugger">
-	      <topic href="doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_debugger.html" label="org.eclipse.wst.xsl.jaxp.launching.debugger">
-	      </topic>
-	   </topic>
-	   <topic label="JAXP Launching">
-	      <topic href="doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_invoke.html" label="org.eclipse.wst.xsl.jaxp.launching.invoke"/>
-	      <topic href="doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_processor.html" label="org.eclipse.wst.xsl.jaxp.launching.processor"/>
-	      <topic href="doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_processorType.html" label="org.eclipse.wst.xsl.jaxp.processorType"/>
-	   </topic>   
-   </topic>
-</toc>
diff --git a/docs/org.eclipse.wst.xsl.sdk.documentation/tocExtension.xml b/docs/org.eclipse.wst.xsl.sdk.documentation/tocExtension.xml
deleted file mode 100644
index 53809f8..0000000
--- a/docs/org.eclipse.wst.xsl.sdk.documentation/tocExtension.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<toc label="Extension Points.">
-   <topic label="JAXP Debugger">
-      <topic href="doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_debugger.html" label="org.eclipse.wst.xsl.jaxp.launching.debugger">
-      </topic>
-   </topic>
-   <topic label="JAXP Launching">
-      <topic href="doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_invoke.html" label="org.eclipse.wst.xsl.jaxp.launching.invoke">
-      </topic>
-      <topic href="doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_processor.html" label="org.eclipse.wst.xsl.jaxp.launching.processor">
-      </topic>
-      <topic href="doc/html/extension_point/org_eclipse_wst_xsl_jaxp_launching_processorType.html" label="org.eclipse.wst.xsl.jaxp.processorType">
-      </topic>
-   </topic>
-</toc>
diff --git a/features/org.eclipse.wst.xsl.feature/.cvsignore b/features/org.eclipse.wst.xsl.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.xsl.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.wst.xsl.feature/.project b/features/org.eclipse.wst.xsl.feature/.project
deleted file mode 100644
index 8aee61d..0000000
--- a/features/org.eclipse.wst.xsl.feature/.project
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-    <name>org.eclipse.wst.xsl.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.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.wst.xsl.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 3750df1..0000000
--- a/features/org.eclipse.wst.xsl.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.feature/.settings/org.eclipse.pde.prefs b/features/org.eclipse.wst.xsl.feature/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fdd8568..0000000
--- a/features/org.eclipse.wst.xsl.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.feature/build.properties b/features/org.eclipse.wst.xsl.feature/build.properties
deleted file mode 100644
index 01b0213..0000000
--- a/features/org.eclipse.wst.xsl.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html
diff --git a/features/org.eclipse.wst.xsl.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xsl.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xsl.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xsl.feature/epl-v10.html b/features/org.eclipse.wst.xsl.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xsl.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.feature/feature.properties b/features/org.eclipse.wst.xsl.feature/feature.properties
deleted file mode 100644
index 0066277..0000000
--- a/features/org.eclipse.wst.xsl.feature/feature.properties
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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 Tools (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 Editor, validator, launching and debugging support
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2008 Doug Satchwell (Chase Technology Ltd),\n\
-David Carver (Standards for Technology in Automotive Retail) and others 2008.\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\
-    Doug Satchwell (Chase Technology Ltd - http://www.chasetechnology.co.uk)\n\
-    David Carver (Standards for Technology in Automotive Retail - http://www.starstandard.org)\n\
-    Jesper Moller (NineConsult - http://www.nineconsult.dk)\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.feature/feature.xml b/features/org.eclipse.wst.xsl.feature/feature.xml
deleted file mode 100644
index e8d5ee3..0000000
--- a/features/org.eclipse.wst.xsl.feature/feature.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xsl.feature"
-      label="%featureName"
-      version="1.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.wst.xsl">
-
-   <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>
-
-   <requires>
-      <import feature="org.eclipse.wst.xml_ui.feature" version="3.0.0"/>
-      <import feature="org.eclipse.jdt" version="3.4.0"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.wst.xsl.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.debug.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.launching"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.xalan"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.xpath.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xalan"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.logging"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.doc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.jxpath"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.xpath.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xml.serializer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.bcel"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="java_cup.runtime"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.saxon"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.jaxp.debug"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.jaxp.debug.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.jaxp.launching"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.log4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xsl.feature/license.html b/features/org.eclipse.wst.xsl.feature/license.html
deleted file mode 100644
index 303e665..0000000
--- a/features/org.eclipse.wst.xsl.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>
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/about.html b/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/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, 2008</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/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 3bf1ba7..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=WTP XSL Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Doug Satchwell (Chase Technology Ltd), David Carver (Standards for Technology in Automotive Retail)\n\
-and others 2008. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index c2341ca..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName=WTP XSL Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index dad95ff..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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 Tools Developer Resources
-
-# "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=Source code WTP XSL.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2008 Doug Satchwell (Chase Technology Ltd),\n\
-David Carver (Standards for Technology in Automotive Retail) and others 2008.\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\
-    Doug Satchwell (Chase Technology Ltd - http://www.chasetechnology.co.uk)\n\
-    David Carver (Standards for Technology in Automotive Retail - http://www.starstandard.org)\n\
-    Jesper Moller (NineConsult - http://www.nineconsult.dk)\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, 2008\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.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>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 &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <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>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/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, 2008</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/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
-
-
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index e7c98b1..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-#
-# Do not translate any values surrounded by {}
-
-blurb=WTP XSL Source\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Doug Satchwell (Chase Technology Ltd), David Carver (Standards for Technology in Automotive Retail)\n\
-and others 2008. All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
-
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index c2341ca..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName=WTP XSL Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.xsl.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
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 3c06918..0000000
--- a/features/org.eclipse.wst.xsl_sdk.feature/feature.properties
+++ /dev/null
@@ -1,138 +0,0 @@
-# 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 Tools 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 Editor, validator, launching and debugging support
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2008 Doug Satchwell (Chase Technology Ltd),\n\
-David Carver (Standards for Technology in Automotive Retail) and others 2008.\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\
-    Doug Satchwell (Chase Technology Ltd - http://www.chasetechnology.co.uk)\n\
-    David Carver (Standards for Technology in Automotive Retail - http://www.starstandard.org)\n\
-    Jesper Moller (NineConsult - http://www.nineconsult.dk)\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 a8de780..0000000
--- a/features/org.eclipse.wst.xsl_sdk.feature/feature.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xsl_sdk.feature"
-      label="%featureName"
-      version="1.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/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"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.sdk.documentation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</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>