This commit was manufactured by cvs2svn to create tag 'v200906231448'.
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/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xsl.saxon/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index eca9f36..0000000
--- a/bundles/org.eclipse.wst.xsl.saxon/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Tue Feb 10 05:24:56 GMT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-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=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
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 7aec9e4..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
-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 fd14010..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/.classpath
+++ /dev/null
@@ -1,15 +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/**"/>
-		</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 af1ed1d..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,87 +0,0 @@
-#Fri Apr 10 19:51:15 GMT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.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.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.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.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.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.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-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=ignore
-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=ignore
-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 3465f09..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,43 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xsl.ui;singleton:=true
-Bundle-Version: 1.0.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.0,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"
-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.contentassist.href;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.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 8131ce9..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/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 bd50aaf..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/plugin.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2009 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
-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
-commandTooltipNewDTDFile = New DTD File
-commandTooltipNewXSDFile = New XML Schema File
-commandTooltipNewXSLFile = New XSL File
-viewNameStylesheet = Stylesheet
-pageSyntaxColoring = Syntax Coloring
-XSL_Property_validation = XSLT Validation
-
-specification.label.0 = Override
\ No newline at end of file
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 0d99ac6..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/plugin.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-	<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.perspectiveExtensions">
-	<perspectiveExtension targetID="org.eclipse.wst.xml.ui.perspective">
-		<newWizardShortcut id="org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard"/>
-	</perspectiveExtension>
- </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.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>
-  </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="%specification.label.0"
-            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>
- <extension
-       point="org.eclipse.core.runtime.preferences">
-    <initializer
-          class="org.eclipse.wst.xsl.ui.internal.PreferenceInitializer">
-    </initializer>
- </extension>
-	
-   <!-- extension
-         point="org.eclipse.wst.sse.ui.quickFixProcessor">
-      <quickFixProcessor
-            class="org.eclipse.wst.xsl.ui.internal.quickassist.OverrideQuickAssist"
-            problemType="org.eclipse.wst.xsl.ui.override">
-      </quickFixProcessor>
-   </extension -->
-	
- <extension point="org.eclipse.ui.menus">
-	<menuContribution locationURI="toolbar:org.eclipse.wst.xml.ui.perspective.NewFileToolBar">
-        <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"/>
-          <visibleWhen checkEnabled="false">
-			<with variable="activeWorkbenchWindow.activePerspective">
-				<equals value="org.eclipse.wst.xml.ui.perspective"/>
-			</with>
-           </visibleWhen>         
-        </command>
-     </menuContribution>
-  </extension>
-
- <extension point="org.eclipse.ui.navigator.navigatorContent">
-	<commonWizard type="new" wizardId="org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard">
-		<enablement>
-		</enablement>
-	</commonWizard>
- </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 8b5a7c5..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/ListWorkbenchAdapter.java
+++ /dev/null
@@ -1,59 +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.ui.plugin.AbstractUIPlugin;
-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 = AbstractUIPlugin.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/Messages.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/Messages.java
deleted file mode 100644
index 82ec74d..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/Messages.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xsl.ui.internal.messages"; //$NON-NLS-1$
-	
-	public static String ExcludeResultPrefixesContentAssist;
-	public static String NoContentAssistance;
-	public static String XSLSyntaxColoringPage;
-	public static String xsltStyleDocument;
-	public static String MainPreferencePage;
-	public static String NewXSLSelectTemplate;
-	public static String NewXSLTemplateDescription;
-	public static String NewXSLUseTemplateButtonText;
-	public static String NewXSLLinkPreferencePage;
-	public static String NewXSLColumnTemplateName;
-	public static String NewXSLColumnTemplateDescription;
-	public static String NewXSLTemplatePreviewTitle;
-	public static String NewXSLFilePageTitle;
-	public static String NewXSLFilePageDescription;
-	public static String NewXSLFilePageWindowTitle;
-	public static String NewXSLFileWizardExtensionError;
-	public static String NewXSLFileAlreadExistsError;
-	public static String VersionTemplateVariableResolverPageDescription;
-	public static String AbstractValidationSettingsPageMbText;
-	public static String AbstractValidationSettingsPageWorkspace;
-	public static String AbstractValidationSettingsPageProject;
-	public static String AbstractValidationSettingsPageJob;
-	public static String ErrorLevelText;
-	public static String WarningLevelText;
-	public static String IgnoreLevelText;
-	public static String XSLValidationPreferencePageTitle;
-	public static String XSLValidationPreferencePageDescription;
-	public static String XSLValidationPreferenceMaxErrorsLabel;
-	public static String XSLValidationPreferenceImportsIncludesLabel;
-	public static String XSLValidationPreferenceUnresolveImportIncludeLabel;
-	public static String XSLValidationPreferenceCircularReferencesLabel;
-	public static String XSLValidationPreferenceNamedTemplatesLabel;
-	public static String XSLValidationPreferenceTemplateConflictsLabel;
-	public static String XSLValidationPreferenceDuplicateParameterLabel;
-	public static String XSLValidationPreferenceMissingParameterAttributeLabel;
-	public static String XSLValidationPreferenceParameterEmptyAttributeLabel;
-	public static String XSLValidationPreferenceCallTemplatesLabel;
-	public static String XSLValidationPreferenceUnresolvedTemplatesLabel;
-	public static String XSLValidationPreferenceMissingParamtersLabel;
-	public static String XSLValidationPreferenceParamtersWithoutValueLabel;
-	public static String XSLValidationPreferenceXPathLabel;
-	public static String XSLValidationPreferenceXPathSyntaxLabel;
-	public static String XSLValidationPreferenceMaxErrorsMsgError;
-	public static String XSLEditorOverrideTemplate;
-	public static String XSLEditorOverrideTemplateMode;
-	public static String CallTemplateContentAssistTemplateName;
-	public static String CallTemplateContentAssistTemplateNameFile;
-	public static String XSLValidationPageSeverityLevel;
-	public static String Open;
-	
-	
-	static {
-	   NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/PreferenceInitializer.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/PreferenceInitializer.java
deleted file mode 100644
index 70dc52e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/PreferenceInitializer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available 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.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-
-public class PreferenceInitializer extends AbstractPreferenceInitializer
-{
-	private static final String ORG_ECLIPSE_WST_XSLT_TEMPLATES_XSL_BASIC = "org.eclipse.wst.xslt.templates.xsl_basic"; //$NON-NLS-1$
-
-	@Override
-	public void initializeDefaultPreferences()
-	{
-		IEclipsePreferences node = new DefaultScope().getNode(XSLUIPlugin.getDefault().getBundle().getSymbolicName());
-		node.put(XSLUIConstants.NEW_FILE_TEMPLATE_NAME, ORG_ECLIPSE_WST_XSLT_TEMPLATES_XSL_BASIC); // default to the basic stylesheet
-	}
-}
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 4d42727..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/StructuredTextViewerConfigurationXSL.java
+++ /dev/null
@@ -1,135 +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.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.equals(IStructuredPartitions.DEFAULT_PARTITION))
-				|| (partitionType.equals(IXMLPartitions.XML_DEFAULT))
-				|| (partitionType.equals(IXSLPartitions.XSL_XPATH))) {
-			processors = new IContentAssistProcessor[] { new XSLContentAssistProcessor() };
-		} else if (partitionType.equals(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.equals(IXMLPartitions.XML_DEFAULT)
-				|| partitionType.equals(IXMLPartitions.XML_CDATA)
-				|| partitionType.equals(IXMLPartitions.XML_COMMENT)
-				|| partitionType.equals(IXMLPartitions.XML_DECLARATION)
-				|| partitionType.equals(IXMLPartitions.XML_PI)
-				|| partitionType.equals(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 cbf5762..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/StylesheetView.java
+++ /dev/null
@@ -1,159 +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.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 8436b34..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLModelAdapterFactory.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;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-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;
-	}
-	
-}
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 c6cae50..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"; //$NON-NLS-1$
-	public static final String NEW_FILE_TEMPLATE_NAME = "NEW_FILE_TEMPLATE_NAME"; //$NON-NLS-1$
-}
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 086b0ad..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.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.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 final 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)
-	 */
-	@Override
-	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)
-	 */
-	@Override
-	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("/"); //$NON-NLS-1$
-		URL localURL = FileLocator.toFileURL(url);
-		String installPath = localURL.getPath();
-		String totalDirectory = installPath + directory;
-		String totalPath = totalDirectory + "/" + filename; //$NON-NLS-1$
-		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/XSLWorkbenchAdapter.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLWorkbenchAdapter.java
deleted file mode 100644
index d11c0ef..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/XSLWorkbenchAdapter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-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.Template;
-import org.eclipse.wst.xsl.core.model.Variable;
-import org.eclipse.wst.xsl.core.model.XSLModelObject;
-
-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:
-			Stylesheet stylesheet = (Stylesheet) obj;
-			return new Object[] {
-					new ListWorkbenchAdapter(stylesheet, null, stylesheet
-							.getVersion(), "icons/full/xslt_launch.gif"), //$NON-NLS-1$
-					new ListWorkbenchAdapter(stylesheet, stylesheet
-							.getImports(), "Imports", "icons/full/imports.gif"), //$NON-NLS-1$ //$NON-NLS-2$
-					new ListWorkbenchAdapter(stylesheet, stylesheet
-							.getIncludes(), "Includes", //$NON-NLS-1$
-							"icons/full/imports.gif"), //$NON-NLS-1$
-					new ListWorkbenchAdapter(stylesheet, stylesheet
-							.getGlobalVariables(), "Variables", null), //$NON-NLS-1$
-					new ListWorkbenchAdapter(stylesheet, stylesheet
-							.getTemplates(), "Templates", null) }; //$NON-NLS-1$
-		}
-		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"; //$NON-NLS-1$
-			break;
-		case IMPORT:
-		case INCLUDE:
-			path = "icons/full/import.gif"; //$NON-NLS-1$
-			break;
-		case TEMPLATE:
-			path = "icons/full/methdef_obj.gif"; //$NON-NLS-1$
-			break;
-		case VARIABLE:
-			path = "icons/full/field_default_obj.gif"; //$NON-NLS-1$
-			break;
-		}
-		return path == null ? null : AbstractUIPlugin.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 //$NON-NLS-1$
-					.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(" "); //$NON-NLS-1$
-			if (t.getMatch() != null)
-				sb.append(t.getMatch()).append(" "); //$NON-NLS-1$
-			if (t.getMode() != null)
-				sb.append("(").append(t.getMode()).append(")");  //$NON-NLS-1$//$NON-NLS-2$
-			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/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 0819243..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewDTDFileWizardDelegate.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.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 static final String DTD_UI_INTERNAL_WIZARD_NEW_DTD_WIZARD_ID = "org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard"; //$NON-NLS-1$
-	private NewWizardAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewWizardAction(DTD_UI_INTERNAL_WIZARD_NEW_DTD_WIZARD_ID);
-	}
-
-	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 ef5235f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewWSDLFileWizardDelegate.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.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 static final String WSDL_UI_ID = "org.eclipse.wst.wsdl.ui"; //$NON-NLS-1$
-	private NewWizardAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewWizardAction(WSDL_UI_ID);
-	}
-
-	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 842c2a3..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewWizardAction.java
+++ /dev/null
@@ -1,76 +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;
-	}
-
-	@Override
-	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 ff0791f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXMLFileWizardDelegate.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.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 static final String XML_UI_INTERNAL_WIZARDS_NEW_XML_WIZARD_ID = "org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard"; //$NON-NLS-1$
-	private NewWizardAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewWizardAction(XML_UI_INTERNAL_WIZARDS_NEW_XML_WIZARD_ID);
-	}
-
-	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 f707b29..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXSDFileWizardDelegate.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.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 static final String XSD_UI_INTERNAL_WIZARDS_NEW_XSD_WIZARD_ID = "org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard"; //$NON-NLS-1$
-	private NewWizardAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewWizardAction(XSD_UI_INTERNAL_WIZARDS_NEW_XSD_WIZARD_ID);
-	}
-
-	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 a6c9c5f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/actions/NewXSLFileWizardDelegate.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.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 static final String ORG_ECLIPSE_WST_XSL_UI_INTERNAL_WIZARDS_NEW_STYLESHEET_WIZARD = "org.eclipse.wst.xsl.ui.internal.wizards.NewStylesheetWizard"; //$NON-NLS-1$
-	private NewWizardAction openAction;
-	private ISelection selection;
-
-	public void init(IWorkbenchWindow window)
-	{
-		this.openAction = new NewWizardAction(ORG_ECLIPSE_WST_XSL_UI_INTERNAL_WIZARDS_NEW_STYLESHEET_WIZARD);
-	}
-
-	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/AbstractXMLElementContentAssistRequest.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/AbstractXMLElementContentAssistRequest.java
deleted file mode 100644
index 3f63371..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/AbstractXMLElementContentAssistRequest.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*******************************************************************************
- *Copyright (c) 2009 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.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.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.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-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;
-
-/**
- * Adopters can extend this class to implement their own content assistance for Element
- * proposals using the XML Content Model.
- * 
- * @author David Carver
- *
- */
-public abstract class AbstractXMLElementContentAssistRequest extends AbstractXSLContentAssistRequest {
-
-	protected static final String XPATH_FIRST_XSLANCESTOR_NODE = "ancestor::xsl:*[1]"; //$NON-NLS-1$
-	protected MarkupTagInfoProvider infoProvider = null;
-	protected XSLContentModelGenerator contentModel;
-	
-	/**
-	 *
-	 * @param node
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public AbstractXMLElementContentAssistRequest(Node node,
-			IStructuredDocumentRegion documentRegion,
-			ITextRegion completionRegion, int begin, int length, String filter,
-			ITextViewer textViewer) {
-		super(node, documentRegion, completionRegion, begin, length, filter, textViewer);
-	}
-
-	protected Iterator<CMNode> getAvailableContentNodes(IDOMDocument domDocument, Node ancestorNode, int includeOptions) {
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(domDocument);
-		CMElementDeclaration cmElementDec = modelQuery.getCMElementDeclaration((Element)ancestorNode);
-		List <CMNode> cmNodeList = modelQuery.getAvailableContent((Element)ancestorNode, cmElementDec, includeOptions);
-		Iterator <CMNode> cmNodeIt = cmNodeList.iterator();
-		return cmNodeIt;
-	}
-
-	protected CustomCompletionProposal createProposal(String proposedText, String additionalInfo, int offset,
-			Image image, int startLength) {
-				CustomCompletionProposal proposal = new CustomCompletionProposal(
-						proposedText, offset, 0, startLength + proposedText.length() - getMatchString().length(), 
-						image, proposedText, null, additionalInfo, 0, true);
-				return proposal;
-			}
-
-	protected Image getCMNodeImage(CMNode cmNode) {
-		Image image = CMImageUtil.getImage(cmNode);
-		if (image == null) {
-			image = XMLEditorPluginImageHelper
-					.getInstance()
-					.getImage(
-							XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
-		}
-		return image;
-	}
-
-	protected String getRequiredName(Node ownerNode, CMNode cmnode) {
-		if (ownerNode != null) {
-			return DOMNamespaceHelper.computeName(cmnode, ownerNode, null);
-		}
-		return cmnode.getNodeName();
-	}
-
-	/**
-	 * Retrieves 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
-	 */
-	protected 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());
-	}
-
-	/**
-	 * 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$
-				//$NON-NLS-1$
-				matchString = matchString.substring(1);
-			}
-			if (!nodeIterator.hasNext()) {
-				return;
-			}
-			while (nodeIterator.hasNext()) {
-				CMNode elementDecl = 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;
-			}
-
-	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;
-	}
-
-	/**
-	 * 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
-	 */
-	protected 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/AbstractXSLContentAssistRequest.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/AbstractXSLContentAssistRequest.java
deleted file mode 100644
index 177f8cc..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/AbstractXSLContentAssistRequest.java
+++ /dev/null
@@ -1,252 +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
-	 */
-	@Override
-	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 bf4dc8c..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/CallTemplateContentAssistRequest.java
+++ /dev/null
@@ -1,104 +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.Messages;
-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"; //$NON-NLS-1$
-	private static final String ATTR_NAME = "name"; //$NON-NLS-1$
-
-	/**
-	 * @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 = Messages.CallTemplateContentAssistTemplateName + nameAttribute.getValue() +
-		                      "\r\n" + Messages.CallTemplateContentAssistTemplateNameFile + template.getStylesheet().getFile().getName(); //$NON-NLS-1$
-		
-		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/ExcludeResultPrefixesContentAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/ExcludeResultPrefixesContentAssist.java
deleted file mode 100644
index 6a4eba1..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/ExcludeResultPrefixesContentAssist.java
+++ /dev/null
@@ -1,120 +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.Messages;
-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.ExcludeResultPrefixesContentAssist;
-	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/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/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 85658ae..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/SelectAttributeContentAssist.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*******************************************************************************
- *Copyright (c) 2008, 2009 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
- *                          bug 259575 - fixed replacement issue and XPath tokenizer
- *                                       position adjuster for matchString.
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.xpath.compiler.XPathParser;
-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.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 SELECT_ATTRIBUTE = "select"; //$NON-NLS-1$
-
-	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 = getAttribute(SELECT_ATTRIBUTE); 
-		
-		this.matchString = extractXPathMatchString(attrNode, getRegion(), getReplacementBeginPosition());
-		
-	    addSelectProposals((Element)getNode().getParentNode(), offset);
-
-		return  getAllCompletionProposals();
-    }
-
-
-	private IDOMAttr getAttribute(String attrName) {
-		return (IDOMAttr)((IDOMElement)getNode()).getAttributeNode(attrName);
-	}
-	
-	
-
-	/**
-	 *  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_ATTRIBUTE);
-	    if (xpathNode == null) {
-	    	return;
-	    }
-	    
-		String xpathString = xpathNode.getValue();
-		if (xpathString.length() == 0) {
-			return;
-		}
-		
-		int startOffset = xpathNode.getValueRegionStartOffset();
-		int tokenOffset = getReplacementBeginPosition() - xpathNode.getValueRegionStartOffset();
-		int tokenPosition = getXPathSeperatorPos(tokenOffset - 1, xpathString);
-		int newStartOffset = startOffset + tokenPosition;
-		
-		replacementLength = getReplacementBeginPosition() - startOffset;
-	}
-		
-	protected String extractXPathMatchString(IDOMAttr node, ITextRegion aRegion, int offset) {
-		if (node == null || node.getValue().length() == 0)	return ""; //$NON-NLS-1$
-		
-		if (matchString.length() < 1) {
-			return matchString;
-		}
-		
-		int column = offset - node.getValueRegionStartOffset() - 1;
-		String nodeValue = node.getValue();
-
-		int seperatorPos = getXPathSeperatorPos(column, nodeValue);
-		
-		if (seperatorPos >= column) {
-			return ""; //$NON-NLS-1$
-		}
-				
-		return node.getValue().substring(seperatorPos, column);
-	}
-
-
-	protected int getXPathSeperatorPos(int column, String nodeValue) {
-		char [] keyTokens = { '/', '[', ']', '(', ')', ',', ' '};
-		
-		int seperatorPos = 0;
-		
-		String potentialMatchString = nodeValue.substring(0, column);
-		
-		for (int cnt = 0; cnt < keyTokens.length; cnt++) {
-			int keyPos = potentialMatchString.lastIndexOf(keyTokens[cnt]);
-			if (keyPos >= 0 && keyPos <= column - 1) {
-				seperatorPos = keyPos + 1;
-			}
-		}
-		
-		int axisPos = nodeValue.indexOf("::"); //$NON-NLS-1$
-		if (axisPos > seperatorPos && axisPos <= column -1) {
-			seperatorPos = axisPos + 1;
-		}
-		return seperatorPos;
-	}
-
-
-	protected void addSelectProposals(Element rootElement, int offset) {
-			addContentModelProposals(offset);
-			addGlobalProposals(rootElement, offset);
-			addLocalProposals(getNode(), offset);
-			addTemplates(TemplateContextTypeIdsXPath.AXIS, offset);
-			addTemplates(TemplateContextTypeIdsXPath.XPATH, offset);
-			addTemplates(TemplateContextTypeIdsXPath.CUSTOM, offset);
-			addTemplates(TemplateContextTypeIdsXPath.OPERATOR, offset);
-	}
-
-
-	private void addContentModelProposals(int offset) {
-		AbstractXMLElementContentAssistRequest xpathXMLproposals =
-			new XPathElementContentAssist(node, documentRegion, getRegion(), offset - getMatchString().length(), getReplacementLength(), getMatchString(), textViewer);
-		ArrayList<ICompletionProposal> xmlProposals = xpathXMLproposals.getCompletionProposals();
-		proposals.addAll(xmlProposals);
-	}
-	
-	
-	
-	/**
-	 * 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 982d93e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TemplateModeAttributeContentAssist.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- *Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- *All rights reserved. This program and the accompanying materials
- *are made available under the terms of the Eclipse Public License v1.0
- *which accompanies this distribution, and is available at
- *http://www.eclipse.org/legal/epl-v10.html
- *
- *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 {
-
-	private static final String MODE_ATTRIBUTE = "mode"; //$NON-NLS-1$
-
-	/**
-	 * 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_ATTRIBUTE);
-			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 6fd954f..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"; //$NON-NLS-1$
-
-	/**
-	 * 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 54a76a6..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/TestAttributeContentAssist.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 (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.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-1$
-	/**
-	 * 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(ATTR_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) {
-			String xpathString = xpathNode.getValue();
-			int startOffset = xpathNode.getValueRegionStartOffset();
-			int tokenOffset = getReplacementBeginPosition() - xpathNode.getValueRegionStartOffset();
-			int tokenPosition = getXPathSeperatorPos(tokenOffset, xpathString);
-			int newStartOffset = startOffset + tokenPosition - 1;
-			
-			replacementLength = getReplacementBeginPosition() - startOffset;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XPathElementContentAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XPathElementContentAssist.java
deleted file mode 100644
index d488a7e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XPathElementContentAssist.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- *Copyright (c) 2008, 2009 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
- *                          bug 259575 - replaces text if MatchString has a length with XML Content Model
- *                                       proposals.
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-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.ui.internal.contentassist.CustomCompletionProposal;
-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.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-import org.w3c.dom.Node;
-
-/**
- * This class provides XML Element proposals within XPath related items like
- * select, test, and match attributes.  This will leverage an ContentModel that
- * has been loaded and try to provide all available XML elements that could be used.
- * It should be enhanced to know the elements to be used based on information from
- * the XPath.
- * 
- * @author David Carver
- * @since 1.0
- */
-public class XPathElementContentAssist extends
-		AbstractXMLElementContentAssistRequest {
-
-	/**
-	 * @param node
-	 * @param parent
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public XPathElementContentAssist(Node node,
-			IStructuredDocumentRegion documentRegion,
-			ITextRegion completionRegion, int begin, int length, String filter,
-			ITextViewer textViewer) {
-		super(node, documentRegion, completionRegion, begin, length,
-				filter, textViewer);
-	}
-
-	/**
-	 * Provides a list of possible proposals for the XML Elements within the current
-	 * scope.  This leverages the ContentModel that was loaded by the XML Catalog, 
-	 * Custom Resolver, or the inferred grammar.
-	 */
-	@Override
-	public ArrayList<ICompletionProposal> getCompletionProposals() {
-		IDOMDocument domDocument = (IDOMDocument) node.getOwnerDocument();
-		
-		getXPathXMLElementProposals(domDocument);
-		
-		
-		return getAllCompletionProposals();
-	}
-
-	private void getXPathXMLElementProposals(IDOMDocument domDocument) {
-		try {
-			Node ancestorNode = XSLTXPathHelper.selectSingleNode(getNode(),
-					XPATH_FIRST_XSLANCESTOR_NODE);
-			
-			Iterator<CMNode> cmNodeIt = getAvailableContentNodes(domDocument,
-					ancestorNode, ModelQuery.INCLUDE_CHILD_NODES);
-			
-			createXPathXMLProposals(ancestorNode, cmNodeIt);
-
-		} catch (Exception ex) {
-			XSLUIPlugin.log(ex);
-		}
-	}
-
-	private void createXPathXMLProposals(Node ancestorNode,
-			Iterator<CMNode> cmNodeIt) {
-		while (cmNodeIt.hasNext()) {
-			CMNode cmNode = cmNodeIt.next();
-			String proposedText = getRequiredName(ancestorNode, cmNode);
-			if (!(proposedText.contains("xsl:") || proposedText.contains("xslt:"))) { //$NON-NLS-1$ //$NON-NLS-2$
-				int offset = getReplacementBeginPosition();
-				Image image = getCMNodeImage(cmNode);
-				int startLength = getCursorPosition() - offset;
-				String additionalInfo = getInfoProvider().getInfo(cmNode);
-				
-				if (matchString.length() > 0) {
-					if (proposedText.startsWith(matchString)) {
-						CustomCompletionProposal proposal = createProposal(
-								proposedText, additionalInfo, offset, image, startLength);
-						addProposal(proposal);
-					}
-				} else {
-					CustomCompletionProposal proposal = createProposal(
-							proposedText, additionalInfo, offset, image, startLength);
-					addProposal(proposal);
-				}					
-			}
-		}
-	}
-
-}
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 6b150ec..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistProcessor.java
+++ /dev/null
@@ -1,453 +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.eclipse.wst.xsl.ui.internal.Messages;
-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 = ""; //$NON-NLS-1$
-	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.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 XSLElementContentAssistRequest(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 = ""; //$NON-NLS-1$
-		
-		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.equals(DOMRegionContext.XML_CONTENT)
-				|| regionType.equals(DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS)
-				|| regionType.equals(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("\"")) { //$NON-NLS-1$
-			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 ae677fa..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLContentAssistRequestFactory.java
+++ /dev/null
@@ -1,184 +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.eclipse.wst.xsl.ui.internal.contentassist.href.HrefContentAssistRequest;
-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/XSLElementContentAssistRequest.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLElementContentAssistRequest.java
deleted file mode 100644
index 8157e2a..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/XSLElementContentAssistRequest.java
+++ /dev/null
@@ -1,124 +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
- *                          bug 263843 - Fix null pointer exception on region
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Collections;
-
-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.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xsl.ui.internal.contentassist.contentmodel.XSLContentModelGenerator;
-import org.w3c.dom.Node;
- 
-
-/**
- * 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 XSLElementContentAssistRequest extends
-		AbstractXMLElementContentAssistRequest {
-
-	/**
-	 * @param node
-	 * @param parent
-	 * @param documentRegion
-	 * @param completionRegion
-	 * @param begin
-	 * @param length
-	 * @param filter
-	 * @param textViewer
-	 */
-	public XSLElementContentAssistRequest(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();
-	}
-
-
-	/**
-	 * 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));
-		}
-	}
-
-	/**
-	 * Provides a list of possible proposals for the XSL Elements within the current
-	 * scope.
-	 */
-	@Override
-	public ArrayList<ICompletionProposal> getCompletionProposals() {
-		if (region == null) {
-			return new ArrayList<ICompletionProposal>();
-		}
-		
-		if (region.getType() == DOMRegionContext.XML_TAG_OPEN) {
-			computeTagOpenProposals();
-		} else if (region.getType() == DOMRegionContext.XML_TAG_NAME) {
-			computeTagNameProposals();
-		}
-		return getAllCompletionProposals();
-	}
-	
-	
-	/**
-	 * Calculates the proposals for the XML Tag Name Region.
-	 */
-	protected void computeTagNameProposals() {
-		// completing the *first* tag in "<tagname1 |<tagname2"
-		
-		// Ignore attributes
-		if (inAttributeRegion()) {
-			return;
-		}
-		
-		addTagNameProposals(this.getElementPosition(node));
-		// addEndTagNameProposals();
-
-	}
-
-}
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 7f3e63c..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/contentmodel/XSLContentModelGenerator.java
+++ /dev/null
@@ -1,165 +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)
-	 */
-	@Override
-	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;
-	}
-
-	@Override
-	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;
-	}
-
-	@Override
-	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)
-	 */
-	@Override
-	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)
-	 */
-	@Override
-	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/href/HrefContentAssistRequest.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/href/HrefContentAssistRequest.java
deleted file mode 100644
index a540d63..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/href/HrefContentAssistRequest.java
+++ /dev/null
@@ -1,184 +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.href;
-
-import java.util.ArrayList;
-import java.util.Collections;
-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.contentassist.AbstractXSLContentAssistRequest;
-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 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 = ""; //$NON-NLS-1$
-			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("../"); //$NON-NLS-1$
-			}
-			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/href/PathComparator.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/href/PathComparator.java
deleted file mode 100644
index 63dd57a..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/contentassist/href/PathComparator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal.contentassist.href;
-
-import java.io.Serializable;
-import java.util.Comparator;
-
-import org.eclipse.core.runtime.IPath;
-
-final class PathComparator implements Comparator<IPath>, Serializable
-{
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -4401179581193111280L;
-
-	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("..")) //$NON-NLS-1$
-					return 1;
-				if (seg2.equals("..")) //$NON-NLS-1$
-					return -1;
-			}
-		}
-		
-		return o1.toString().compareTo(o2.toString());
-	}
-}
\ No newline at end of file
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 c2d5d8f..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/doubleclick/XSLDoubleClickStrategy.java
+++ /dev/null
@@ -1,118 +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.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 {
-	static final char[] XML_DELIMITERS = { ' ', '\'', '\"', '[', ']',
-			'|', '(', ')', '{', '}', '=', '!' };
-	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/OverrideIndicator.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/OverrideIndicator.java
deleted file mode 100644
index ccd6d71..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/OverrideIndicator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal.editor;
-
-import org.eclipse.jface.text.source.Annotation;
-
-/**
- * Overwrite and override indicator annotation.
- * 
- * @since 1.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 1.0
-	 */
-	OverrideIndicator(String text, String key)
-	{
-		super(OverrideIndicatorManager.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);
-	}
-}
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 d50159c..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/OverrideIndicatorImageProvider.java
+++ /dev/null
@@ -1,64 +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.plugin.AbstractUIPlugin;
-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 AbstractUIPlugin.imageDescriptorFromPlugin(XSLUIPlugin.PLUGIN_ID, "icons/full/over_co.gif"); //$NON-NLS-1$
-		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 7ef6209..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/OverrideIndicatorManager.java
+++ /dev/null
@@ -1,173 +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.osgi.util.NLS;
-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.ui.internal.Messages;
-
-/**
- * Manages the override and overwrite indicators for the given Java element and annotation model.
- * 
- * @since 3.0
- */
-public class OverrideIndicatorManager
-{
-
-
-	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 1.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 1.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 = NLS.bind(Messages.XSLEditorOverrideTemplate , template.getName(), nestedFile.getName());
-							annotationMap.put(
-								new OverrideIndicator(text, "binding.getKey()"),  //$NON-NLS-1$
-								new Position(template.getOffset(), template.getLength())
-							);
-						}
-						else
-						{
-							String[] overrideParms = { template.getMatch(),template.getMode(), nestedFile.getName() };
-							
-							String text = NLS.bind(Messages.XSLEditorOverrideTemplateMode, overrideParms);
-							annotationMap.put(
-								new OverrideIndicator(text, "binding.getKey()"),  //$NON-NLS-1$
-								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 = 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 fe1d020..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/SourceFileHyperlink.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.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.osgi.util.NLS;
-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.Messages;
-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 NLS.bind(Messages.Open, linkedFile.getName());
-	}
-
-	/* (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 d8b9654..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/editor/XSLEditor.java
+++ /dev/null
@@ -1,73 +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.ui.texteditor.templates.ITemplatesPage;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xsl.ui.internal.templates.XSLTemplatesPage;
-
-/**
- * XSL specific extensions to the SSE UI that haven't yet been made
- * available to the SSE.
- * 
- * @since 1.0
- */
-public class XSLEditor extends StructuredTextEditor
-{
-	private OverrideIndicatorManager fOverrideIndicatorManager;
-	
-	/**
-	 * @since 1.0
-	 */
-	private XSLTemplatesPage fTemplatesPage;
-
-	@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);
-		}
-	}
-	
-	/** (non-Javadoc)
-	 * @see org.eclipse.wst.sse.ui.StructuredTextEditor#getAdapter(java.lang.Class)
-	 */
-	@Override
-	public Object getAdapter(Class required) {
-		if (ITemplatesPage.class.equals(required)) {
-			if (fTemplatesPage == null)
-				fTemplatesPage = new XSLTemplatesPage(this);
-			return fTemplatesPage;
-		}
-
-		return super.getAdapter(required);
-	}
-}
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 a8250a1..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"; //$NON-NLS-1$
-	private static final String ATTR_NAME = "name"; //$NON-NLS-1$
-	private static final String ELM_CALL_TEMPLATE = "call-template"; //$NON-NLS-1$
-
-	/**
-	 * 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 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/messages.properties b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/messages.properties
deleted file mode 100644
index 61c2afb..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/messages.properties
+++ /dev/null
@@ -1,53 +0,0 @@
-MainPreferencePage = Expand the tree for more preferences.
-ExcludeResultPrefixesContentAssist = XML Namespace:
-NoContentAssistance = No Content Assistance Proposals Available.
-XSLSyntaxColoringPage = \nDefault colors and fonts for <a href="org.eclipse.wst.sse.ui.preferences.xml.colors">XML</a> can be configured on the XML Syntax 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
-NewXSLSelectTemplate = Select XSL Template.
-NewXSLTemplateDescription = Select a template as initial content for the stylesheet.
-NewXSLUseTemplateButtonText = Use template.
-NewXSLLinkPreferencePage = Templates are \"New Stylesheet\" templates found in the <a>XSL</a> preference page.
-NewXSLColumnTemplateName = Name
-NewXSLColumnTemplateDescription = Description
-NewXSLTemplatePreviewTitle = Preview
-NewXSLFilePageTitle = XSL Stylesheet
-NewXSLFilePageDescription = Create a new XSL Stylesheet.
-NewXSLFilePageWindowTitle = New XSL Stylesheet
-NewXSLFileWizardExtensionError = The file name must end in one of the following extensions {0}.
-NewXSLFileAlreadExistsError = The same name already exists.
-VersionTemplateVariableResolverPageDescription = XSLT Version preference.
-AbstractValidationSettingsPageMbText = XSL Validation
-AbstractValidationSettingsPageWorkspace = XSL Workspace Validation
-AbstractValidationSettingsPageProject = XSL Project Level Validation
-AbstractValidationSettingsPageJob = XSL Validation Job
-ErrorLevelText = Error
-WarningLevelText = Warning
-IgnoreLevelText = Ignore
-XSLValidationPreferencePageTitle = XSLT Validation
-XSLValidationPreferencePageDescription = Configure validation preferences.
-XSLValidationPreferenceMaxErrorsLabel = Maximum number of errors reported per stylesheet:
-XSLValidationPreferenceImportsIncludesLabel = Imports and Includes
-XSLValidationPreferenceUnresolveImportIncludeLabel = Unresolved include/import:
-XSLValidationPreferenceCircularReferencesLabel = Circular references:
-XSLValidationPreferenceNamedTemplatesLabel = Named Templates
-XSLValidationPreferenceTemplateConflictsLabel = Template name conflicts:
-XSLValidationPreferenceDuplicateParameterLabel = Duplicate parameter:
-XSLValidationPreferenceMissingParameterAttributeLabel = Parameter without name attribute:
-XSLValidationPreferenceParameterEmptyAttributeLabel = Parameter with empty name attribute:
-XSLValidationPreferenceCallTemplatesLabel = Template Calls
-XSLValidationPreferenceUnresolvedTemplatesLabel = Unresolved templates:
-XSLValidationPreferenceMissingParamtersLabel = Missing parameters:
-XSLValidationPreferenceParamtersWithoutValueLabel = Parameters without value:
-XSLValidationPreferenceXPathLabel = XPath Problems
-XSLValidationPreferenceXPathSyntaxLabel = Incorrect XPath syntax:
-XSLValidationPreferenceMaxErrorsMsgError = Max errors must be a positive integer
-XSLEditorOverrideTemplate = Overrides {0} in {1}.
-XSLEditorOverrideTemplateMode = overrides \"{0}\" ({1}) in {2}.
-CallTemplateContentAssistTemplateName = Template Name:
-CallTemplateContentAssistTemplateNameFile = File:
-XSLValidationPageSeverityLevel = Select the serverity level for the following validation problems:
-Open = Open ''{0}''
-
-
-
-
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 a969dc2..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/AbstractValidationSettingsPage.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 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.eclipse.wst.xsl.ui.internal.Messages;
-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;
-	
-	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() {
-			@Override
-			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;
-	}
-	
-	@Override
-	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(Messages.AbstractValidationSettingsPageMbText);
-			/* Choose which message to use based on if its project or workspace settings */
-			String msg = (getProject() == null) ? Messages.AbstractValidationSettingsPageWorkspace : Messages.AbstractValidationSettingsPageProject;
-			mb.setMessage(msg);
-			switch(mb.open()) {
-				case SWT.CANCEL:
-					return false;
-				case SWT.YES:
-					ValidateJob job = new ValidateJob(Messages.AbstractValidationSettingsPageJob);
-					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);
-		}
-
-		@Override
-		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 ae2a7d0..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/AbstractXSLPreferencePage.java
+++ /dev/null
@@ -1,202 +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()
-		{
-			@Override
-			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 = 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 = 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/ComboData.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/ComboData.java
deleted file mode 100644
index 14346ec..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/ComboData.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal.preferences;
-
-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;
-	}
-}
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 2ab0432..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/MainPreferencePage.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 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;
-import org.eclipse.wst.xsl.ui.internal.Messages;
-
-/**
- * 
- *
- */
-public class MainPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-	/**
-	 * MainPreferncePage is the constructor for the XSL Preference Page
-	 */
-	public MainPreferencePage()
-	{
-		super();
-		noDefaultAndApplyButton();
-	}
-
-	/** 
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
-	 */
-	public void init(IWorkbench workbench)
-	{
-	}
-
-	@Override
-	protected Control createContents(Composite ancestor)
-	{
-		initializeDialogUnits(ancestor);
-
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		ancestor.setLayout(layout);
-
-		Label label = new Label(ancestor, SWT.NONE);
-		label.setText(Messages.MainPreferencePage);
-		
-		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 ce0165c..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/PropertyPreferencePage.java
+++ /dev/null
@@ -1,305 +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();
-	}
-
-	@Override
-	public final void applyData(Object data) {
-		super.applyData(data);
-		if (data instanceof Map) {
-			Data = (Map) data;
-			updateLinkEnablement();
-		}
-	}
-
-	protected abstract Control createCommonContents(Composite composite);
-
-	@Override
-	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); 
-			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() {
-				@Override
-				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()) {
-
-			@Override
-			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();
-	}
-
-	@Override
-	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$ 
-				}
-				preferenceScopes[0].getNode(getPreferenceNodeQualifier()).remove(getProjectSettingsKey());
-			}
-		}
-		return ok;
-	}
-	
-	@Override
-	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 14c24fe..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/ValidationPreferencePage.java
+++ /dev/null
@@ -1,167 +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;
-import org.eclipse.wst.xsl.ui.internal.Messages;
-
-/**
- * Preference page for XSL validator preferences.
- * 
- * @author Doug Satchwell
- * @deprecated  This has been replaced by XSLValidationPreferencePage
- */
-@Deprecated
-public class ValidationPreferencePage extends AbstractXSLPreferencePage
-{
-	private static final String[] ERRORS = new String[] { Messages.ErrorLevelText, Messages.WarningLevelText, Messages.IgnoreLevelText };
-	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(Messages.XSLValidationPreferencePageTitle);
-		setDescription(Messages.XSLValidationPreferencePageDescription);
-	}
-
-	@Override
-	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, Messages.XSLValidationPreferenceMaxErrorsLabel);
-		maxErrorsText = createTextField(body);
-		maxErrorsText.addModifyListener(this);
-
-		Composite twistie;
-		
-		twistie = createTwistie(body,Messages.XSLValidationPreferenceImportsIncludesLabel,2);		
-		createCombo(twistie, Messages.XSLValidationPreferenceUnresolveImportIncludeLabel, ValidationPreferences.MISSING_INCLUDE);
-		createCombo(twistie, Messages.XSLValidationPreferenceCircularReferencesLabel, ValidationPreferences.CIRCULAR_REF);
-
-		twistie = createTwistie(body, Messages.XSLValidationPreferenceNamedTemplatesLabel, 2);		
-		createCombo(twistie, Messages.XSLValidationPreferenceTemplateConflictsLabel, ValidationPreferences.TEMPLATE_CONFLICT);
-		createCombo(twistie, Messages.XSLValidationPreferenceDuplicateParameterLabel, ValidationPreferences.DUPLICATE_PARAMETER);
-		createCombo(twistie, Messages.XSLValidationPreferenceMissingParameterAttributeLabel, ValidationPreferences.NAME_ATTRIBUTE_MISSING);
-		createCombo(twistie, Messages.XSLValidationPreferenceParameterEmptyAttributeLabel, ValidationPreferences.NAME_ATTRIBUTE_EMPTY);
-		
-		twistie = createTwistie(body, Messages.XSLValidationPreferenceCallTemplatesLabel,2);		
-		createCombo(twistie, Messages.XSLValidationPreferenceUnresolvedTemplatesLabel, ValidationPreferences.CALL_TEMPLATES);
-		createCombo(twistie, Messages.XSLValidationPreferenceMissingParamtersLabel, ValidationPreferences.MISSING_PARAM);
-		createCombo(twistie, Messages.XSLValidationPreferenceParamtersWithoutValueLabel, ValidationPreferences.EMPTY_PARAM);
-
-		twistie = createTwistie(body, Messages.XSLValidationPreferenceXPathLabel, 2);
-		createCombo(twistie, Messages.XSLValidationPreferenceXPathSyntaxLabel, 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 = Messages.XSLValidationPreferenceMaxErrorsMsgError;
-		}
-		catch (NumberFormatException e)
-		{
-			errorMessage = Messages.XSLValidationPreferenceMaxErrorsMsgError;
-		}
-		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/XSLSyntaxColoringPage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLSyntaxColoringPage.java
deleted file mode 100755
index e308725..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLSyntaxColoringPage.java
+++ /dev/null
@@ -1,926 +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.xsl.ui.internal.Messages;
-
-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;
-	}
-
-	@Override
-	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);
-		link.setText(Messages.XSLSyntaxColoringPage);
-		link.addSelectionListener(new SelectionAdapter() {
-			@Override
-			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_); // = "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_); // = "&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(XSLSyntaxColoringPage.XSLFILES_DIR,
-					XSLSyntaxColoringPage.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() {
-			@Override
-			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() {
-			@Override
-			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() {
-			@Override
-			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() {
-			@Override
-			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() {
-			@Override
-			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() {
-			@Override
-			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;
-	}
-
-	@Override
-	public void dispose() {
-		if (overlayStore != null) {
-			overlayStore.stop();
-		}
-		super.dispose();
-	}
-
-	@Override
-	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_);
-	}
-
-	@Override
-	protected void performDefaults() {
-		super.performDefaults();
-		getOverlayStore().loadDefaults();
-		applyStyles();
-		stylesViewer.setSelection(StructuredSelection.EMPTY);
-		activate(null);
-		styledText.redraw();
-	}
-
-	@Override
-	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() {
-			@Override
-			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 63694ce..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLUIPreferenceInitializer.java
+++ /dev/null
@@ -1,56 +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.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.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()
-	 */
-	@Override
-	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 096f5e9..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/preferences/XSLValidationPreferencePage.java
+++ /dev/null
@@ -1,347 +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.Messages;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-public class XSLValidationPreferencePage extends AbstractValidationSettingsPage implements ModifyListener {
-
-	private static final String XSL_UI_PROPERTY_PAGE_PROJECT_VALIDATION_ID = "org.eclipse.wst.xsl.ui.propertyPage.project.validation"; //$NON-NLS-1$
-	private static final String XSL_UI_PREFERENCES_VALIDATION_ID = "org.eclipse.wst.xsl.ui.preferences.Validation"; //$NON-NLS-1$
-	private static final String[] ERRORS = new String[] { Messages.ErrorLevelText, Messages.WarningLevelText, Messages.IgnoreLevelText };
-	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);
-	}
-	
-	@Override
-	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;
-		
-		createLabel(body, Messages.XSLValidationPreferenceMaxErrorsLabel);
-		maxErrorsText = createTextField(body);
-		maxErrorsText.addModifyListener(this);
-
-
-		Label description = new Label(body, SWT.NONE);
-		description.setText(Messages.XSLValidationPageSeverityLevel);
-		description.setFont(pageContent.getFont());
-		description.setLayoutData(gd);
-		
-
-
-		ExpandableComposite twistie;
-		
-		int columns = 3;
-		twistie = createTwistie(body, Messages.XSLValidationPreferenceImportsIncludesLabel,columns);
-		Composite inner = createInnerComposite(parent, twistie, columns);
-		
-		String label = Messages.XSLValidationPreferenceUnresolveImportIncludeLabel;
-		createCombo(inner, label, ValidationPreferences.MISSING_INCLUDE);
-
-		inner = createInnerComposite(parent, twistie, columns);
-		createCombo(inner, label, ValidationPreferences.MISSING_INCLUDE);
-		createCombo(inner, Messages.XSLValidationPreferenceCircularReferencesLabel, ValidationPreferences.CIRCULAR_REF);
-
-		twistie = createTwistie(body, Messages.XSLValidationPreferenceNamedTemplatesLabel,columns);
-		inner = createInnerComposite(parent, twistie, columns);
-		
-		createCombo(inner, Messages.XSLValidationPreferenceTemplateConflictsLabel, ValidationPreferences.TEMPLATE_CONFLICT);
-		createCombo(inner, Messages.XSLValidationPreferenceDuplicateParameterLabel, ValidationPreferences.DUPLICATE_PARAMETER);
-		createCombo(inner, Messages.XSLValidationPreferenceParamtersWithoutValueLabel, ValidationPreferences.NAME_ATTRIBUTE_MISSING);
-		createCombo(inner, Messages.XSLValidationPreferenceMissingParameterAttributeLabel, ValidationPreferences.NAME_ATTRIBUTE_EMPTY);
-		
-		twistie = createTwistie(body,Messages.XSLValidationPreferenceCallTemplatesLabel,columns);
-		inner = createInnerComposite(parent, twistie, columns);
-		
-		createCombo(inner, Messages.XSLValidationPreferenceUnresolvedTemplatesLabel, ValidationPreferences.CALL_TEMPLATES);
-		createCombo(inner, Messages.XSLValidationPreferenceMissingParamtersLabel, ValidationPreferences.MISSING_PARAM);
-		createCombo(inner, Messages.XSLValidationPreferenceMissingParameterAttributeLabel, ValidationPreferences.EMPTY_PARAM);
-
-		twistie = createTwistie(body, Messages.XSLValidationPreferenceXPathLabel,columns);
-		inner = createInnerComposite(parent, twistie, columns);
-		createCombo(inner, Messages.XSLValidationPreferenceXPathSyntaxLabel, 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;
-	}
-	
-	@Override
-	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() {
-			@Override
-			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 XSL_UI_PREFERENCES_VALIDATION_ID;
-	}
-
-	@Override
-	protected String getProjectSettingsKey() {
-		return XSLCorePlugin.USE_PROJECT_SETTINGS;
-	}
-	
-	protected IDialogSettings getDialogSettings() {
-		return XSLUIPlugin.getDefault().getDialogSettings();
-	}	
-
-	@Override
-	protected String getPropertyPageID() {
-		return XSL_UI_PROPERTY_PAGE_PROJECT_VALIDATION_ID;
-	}
-
-	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 = Messages.XSLValidationPreferenceMaxErrorsMsgError;
-		}
-		catch (NumberFormatException e)
-		{
-			errorMessage = Messages.XSLValidationPreferenceMaxErrorsMsgError;
-		}
-		setErrorMessage(errorMessage);
-		setValid(errorMessage == null);
-	}	
-	
-	protected void enableValues() {
-	}	
-	
-	@Override
-	protected void performDefaults() {
-		resetSeverities();
-		super.performDefaults();
-	}
-	
-	/** (non-Javadoc)
-	 * @see org.eclipse.wst.xsl.ui.internal.preferences.AbstractValidationSettingsPage#performOk()
-	 */
-	@Override
-	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/quickassist/OverrideQuickAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/quickassist/OverrideQuickAssist.java
deleted file mode 100644
index ec7bb70..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/quickassist/OverrideQuickAssist.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal.quickassist;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext;
-import org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
-import org.eclipse.jface.text.source.Annotation;
-
-public class OverrideQuickAssist implements IQuickAssistProcessor
-{
-
-	public OverrideQuickAssist()
-	{
-		// TODO Auto-generated constructor stub
-	}
-
-	public boolean canAssist(IQuickAssistInvocationContext invocationContext)
-	{
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean canFix(Annotation annotation)
-	{
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public ICompletionProposal[] computeQuickAssistProposals(IQuickAssistInvocationContext invocationContext)
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getErrorMessage()
-	{
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/quickassist/ValidationQuickAssist.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/quickassist/ValidationQuickAssist.java
deleted file mode 100644
index 5755d03..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/quickassist/ValidationQuickAssist.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Chase Technologies and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Doug Satchwell - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.quickassist;
-
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext;
-import org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
-import org.eclipse.jface.text.source.Annotation;
-
-public class ValidationQuickAssist implements IQuickAssistProcessor
-{
-	private String problemId;
-
-	public ValidationQuickAssist()
-	{
-		super();
-	}
-
-	public boolean canAssist(IQuickAssistInvocationContext invocationContext)
-	{
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	public boolean canFix(Annotation annotation)
-	{
-		// TODO Auto-generated method stub
-		return true;
-	}
-
-	public ICompletionProposal[] computeQuickAssistProposals(IQuickAssistInvocationContext invocationContext)
-	{
-		CompletionProposal proposal = new CompletionProposal("doug",5,10,11); //$NON-NLS-1$
-		return new ICompletionProposal[]{proposal};
-	}
-
-	public String getErrorMessage()
-	{
-		return null;
-	}
-
-	public void setProblemId(String id)
-	{
-		this.problemId = id;
-	}
-
-}
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 ca234c8..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/style/LineStyleProviderForXSL.java
+++ /dev/null
@@ -1,518 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 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.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.ui.texteditor.ChainedPreferenceStore;
-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.ui.internal.preferences.ui.ColorHelper;
-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;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-/**
- * 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 ReconcilerHighlighter recHighlighter = null;
-
-	private IPreferenceStore xmlPreferenceStore = null;
-	private IPreferenceStore xslPreferenceStore = null;
-	private IPreferenceStore combinedPreferenceStore = null;
-	private IPropertyChangeListener preferenceListener  = new PropertyChangeListener();
-	
-	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);
-		}
-	}	
-
-	@Override
-	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)
-	 */
-	@Override
-	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);
-					}
-				}
-			}
-			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;
-
-	}
-
-	@Override
-	protected TextAttribute getAttributeFor(ITextRegionCollection collection,
-			ITextRegion textRegion) {
-		if (textRegion == null) {
-			return XMLTextAttributeMap.getInstance()
-					.getTextAttributeMap().get(IStyleConstantsXML.CDATA_TEXT);
-		}
-
-		String type = textRegion.getType();
-		if (collection.getText().contains("xsl:")) { //$NON-NLS-1$
-			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));
-	}
-
-	@Override
-	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;
-
-		if (styleKey != null) {
-			// overwrite style preference with new value
-			addTextAttribute(styleKey);
-		}
-		
-		if(recHighlighter != null)
-			recHighlighter.refreshDisplay();
-		
-	}
-	
-	/**
-	 * Looks up the colorKey in the preference store and adds the style
-	 * information to list of TextAttributes
-	 * 
-	 * @param colorKey
-	 */
-	@Override
-	protected void addTextAttribute(String colorKey) {
-		if (getColorPreferences() != null) {
-			String prefString = getColorPreferences().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;
-				}
-
-				updateTextAttribute(colorKey, foreground, background, style);
-			}
-		}
-	}
-
-	private void updateTextAttribute(String colorKey, RGB foreground,
-			RGB background, int style) {
-		TextAttribute createTextAttribute = createTextAttribute(foreground, background, style);
-		
-		TextAttribute textAttribute =
-			XSLTextAttributeMap.getInstance().getTextAttributeMap().get(colorKey);
-		if (textAttribute != null) {
-			XSLTextAttributeMap.getInstance().getTextAttributeMap().put(colorKey, createTextAttribute);
-			return;
-		}
-		
-		textAttribute =
-				XMLTextAttributeMap.getInstance().getTextAttributeMap().get(colorKey);
-		if (textAttribute != null) {
-			XMLTextAttributeMap.getInstance().getTextAttributeMap().put(colorKey, createTextAttribute);
-		}
-	}	
-
-	/*
-	 * (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)
-	 */
-	@Override
-	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)
-	 */
-	@Override
-	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)
-	 */
-	@Override
-	public void init(IStructuredDocument structuredDocument,
-			ReconcilerHighlighter highlighter) {
-		this.structuredDocument = structuredDocument;
-		recHighlighter = highlighter;
-
-		if (isInitialized())
-			return;
-
-		registerPreferenceManager();
-
-		setInitialized(true);
-	}
-
-	@Override
-	public void release() {
-		unRegisterPreferenceManager();
-		setInitialized(false);
-	}
-
-	@Override
-	protected void unRegisterPreferenceManager() {
-		IPreferenceStore pref = getColorPreferences();
-		if (pref != null) {
-			pref.removePropertyChangeListener(preferenceListener);
-		}
-	}
-
-	@Override
-	protected void registerPreferenceManager() {
-		IPreferenceStore pref = getColorPreferences();
-		if (pref != null) {
-			pref.addPropertyChangeListener(preferenceListener  );
-		}
-	}
-
-	/**
-	 * Returns the initialized.
-	 * 
-	 * @return boolean
-	 */
-	@Override
-	public boolean isInitialized() {
-		return initialized;
-	}
-
-	/**
-	 * Sets the initialized.
-	 * 
-	 * @param initialized
-	 *            The initialized to set
-	 */
-	private void setInitialized(boolean initialized) {
-		this.initialized = initialized;
-	}
-
-	@Override
-	protected IStructuredDocument getDocument() {
-		return structuredDocument;
-	}
-
-	/**
-	 */
-	@Override
-	protected Highlighter getHighlighter() {
-		return highlighter;
-	}
-	
-	@Override
-	protected IPreferenceStore getColorPreferences() {
-		if (xmlPreferenceStore == null) {
-			xmlPreferenceStore = XMLUIPlugin.getDefault().getPreferenceStore();
-		}
-		if (xslPreferenceStore == null) {
-			xslPreferenceStore = XSLUIPlugin.getDefault().getPreferenceStore();
-		}
-		combinedPreferenceStore = new ChainedPreferenceStore(new IPreferenceStore[] { xmlPreferenceStore, xslPreferenceStore });
-		return combinedPreferenceStore;
-	}
-
-	@Override
-	protected TextAttribute createTextAttribute(RGB foreground, RGB background, boolean bold) {
-		return new TextAttribute((foreground != null) ? EditorUtility.getColor(foreground) : null, (background != null) ? EditorUtility.getColor(background) : null, bold ? SWT.BOLD : SWT.NORMAL);
-	}
-
-	@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
-	protected TextAttribute getAttributeFor(ITextRegion region) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	protected void loadColors() {
-		// TODO Auto-generated method stub
-		
-	}
-	
-}
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 c1179f2..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 getXMLPreferenceStore() {
-		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 (getXMLPreferenceStore() != null) {
-			String prefString = getXMLPreferenceStore().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 4b6bc47..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/VersionTemplateVariableResolverXSL.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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) - externalize strings.
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.templates;
-
-import org.eclipse.jface.text.templates.SimpleTemplateVariableResolver;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.wst.xsl.ui.internal.Messages;
-
-public class VersionTemplateVariableResolverXSL extends SimpleTemplateVariableResolver
-{
-	private static final String XSLT_VERSION_1_0 = "1.0"; //$NON-NLS-1$
-	private static final String VERSION_TYPE = getVersionType();
-
-	private static String getVersionType()
-	{
-		return "xsl_version"; //$NON-NLS-1$
-	}
-
-	public VersionTemplateVariableResolverXSL()
-	{
-		super(VERSION_TYPE, Messages.VersionTemplateVariableResolverPageDescription);
-	}
-
-	@Override
-	protected String resolve(TemplateContext context)
-	{
-		return XSLT_VERSION_1_0;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/XSLTemplatesPage.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/XSLTemplatesPage.java
deleted file mode 100644
index b766c56..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/templates/XSLTemplatesPage.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 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.templates;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.ITextViewerExtension;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.DocumentTemplateContext;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.ui.texteditor.templates.AbstractTemplatesPage;
-import org.eclipse.wst.xml.xpath.ui.internal.XPathUIPlugin;
-import org.eclipse.wst.xml.xpath.ui.internal.templates.TemplateContextTypeIdsXPath;
-import org.eclipse.wst.xsl.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xsl.ui.internal.editor.XSLEditor;
-
-/**
- * The XSL Templates Page is used by the TemplatesViewer to display available
- * XSL Templates for use within a XSL Structured Text Editor. It is provided as
- * an example on how other SSE editors can contribute their templates to the
- * page.
- * 
- * @author dcarver
- * 
- */
-
-public class XSLTemplatesPage extends AbstractTemplatesPage {
-
-	private static final String PREFERENCE_PAGE_ID = "org.eclipse.wst.xsl.ui.XPath"; //$NON-NLS-1$
-
-	private static final TemplateStore TEMPLATE_STORE = XPathUIPlugin
-			.getDefault().getXPathTemplateStore();
-
-	private static final IPreferenceStore PREFERENCE_STORE = XPathUIPlugin
-			.getDefault().getPreferenceStore();
-
-	private static final ContextTypeRegistry TEMPLATE_CONTEXT_REGISTRY = XPathUIPlugin
-			.getDefault().getXPathTemplateContextRegistry();
-
-	private XSLEditor fTextEditor;
-
-	public XSLTemplatesPage(XSLEditor xslTextEditor) {
-		super(xslTextEditor, xslTextEditor.getTextViewer());
-		fTextEditor = xslTextEditor;
-	}
-
-	@Override
-	protected String[] getContextTypeIds(IDocument document, int offset) {
-		return new String[] { TemplateContextTypeIdsXPath.XPATH,
-				TemplateContextTypeIdsXPath.AXIS,
-				TemplateContextTypeIdsXPath.OPERATOR };
-	}
-
-	@Override
-	protected ContextTypeRegistry getContextTypeRegistry() {
-		return TEMPLATE_CONTEXT_REGISTRY;
-	}
-
-	@Override
-	protected String getPreferencePageId() {
-		return PREFERENCE_PAGE_ID;
-	}
-
-	@Override
-	protected IPreferenceStore getTemplatePreferenceStore() {
-		return PREFERENCE_STORE;
-	}
-
-	@Override
-	protected TemplateStore getTemplateStore() {
-		return TEMPLATE_STORE;
-	}
-
-	// This code based on the JavaTemplatesPage code. Modified to work with
-	// SSE
-
-	@Override
-	protected void insertTemplate(Template template, IDocument document) {
-		ISourceViewer contextViewer = fTextEditor.getTextViewer();
-		ITextSelection textSelection = (ITextSelection) contextViewer
-				.getSelectionProvider().getSelection();
-
-		if (!isValidTemplate(document, template, textSelection.getOffset(),
-				textSelection.getLength()))
-			return;
-
-		beginCompoundChange(contextViewer);
-
-		/*
-		 * The Editor checks whether a completion for a word exists before it
-		 * allows for the template to be applied. We pickup the current text at
-		 * the selection position and replace it with the first char of the
-		 * template name for this to succeed. Another advantage by this method
-		 * is that the template replaces the selected text provided the
-		 * selection by itself is not used in the template pattern.
-		 */
-
-		String savedText;
-
-		try {
-			savedText = document.get(textSelection.getOffset(), textSelection
-					.getLength());
-
-			if (savedText.length() == 0) {
-				String prefix = getIdentifierPart(document, template,
-						textSelection.getOffset(), textSelection.getLength());
-
-				if (prefix.length() > 0
-						&& !template.getName().startsWith(prefix)) {
-					return;
-				}
-
-				if (prefix.length() > 0) {
-					contextViewer.setSelectedRange(textSelection.getOffset()
-							- prefix.length(), prefix.length());
-
-					textSelection = (ITextSelection) contextViewer
-							.getSelectionProvider().getSelection();
-				}
-			}
-
-			document.replace(textSelection.getOffset(), textSelection
-					.getLength(), template.getName().substring(0, 1));
-
-		} catch (BadLocationException e) {
-			endCompoundChange(contextViewer);
-			return;
-		}
-
-		Region region = new Region(textSelection.getOffset() + 1, 0);
-
-		contextViewer.getSelectionProvider().setSelection(
-				new TextSelection(textSelection.getOffset(), 1));
-
-		DocumentTemplateContext context = getContext(document, template,
-				textSelection.getOffset(), textSelection.getLength());
-
-		context.setVariable("selection", savedText); //$NON-NLS-1$
-
-		if (context.getKey().length() == 0) {
-			try {
-				document.replace(textSelection.getOffset(), 1, savedText);
-			} catch (BadLocationException e) {
-				endCompoundChange(contextViewer);
-				return;
-			}
-		}
-
-		ITextViewer viewer = fTextEditor.getTextViewer();
-		int offset = viewer.getTextWidget().getCaretOffset();
-		int startLength = offset - region.getOffset();
-		String pattern = template.getPattern().replace("${cursor}", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		CustomCompletionProposal proposal = new CustomCompletionProposal(
-				pattern, offset, 0, startLength + pattern.length(),
-				getImage(template), template.getName(), null, null, 0);
-
-		fTextEditor.getSite().getPage().activate(fTextEditor);
-		proposal.apply(fTextEditor.getTextViewer(), ' ', 0, offset);
-		viewer.getTextWidget().setCaretOffset(offset + pattern.length() - 1);
-		endCompoundChange(contextViewer);
-	}
-
-	@Override
-	protected boolean isValidTemplate(IDocument document, Template template,
-			int offset, int length) {
-
-		String[] contextIds = getContextTypeIds(document, offset);
-
-		for (int i = 0; i < contextIds.length; i++) {
-			if (contextIds[i].equals(template.getContextTypeId())) {
-				DocumentTemplateContext context = getContext(document,
-						template, offset, length);
-				return context.canEvaluate(template);
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Undomanager - end compound change
-	 * 
-	 * @param viewer
-	 */
-
-	private void endCompoundChange(ISourceViewer viewer) {
-
-		if (viewer instanceof ITextViewerExtension)
-			((ITextViewerExtension) viewer).getRewriteTarget()
-					.endCompoundChange();
-	}
-
-	/**
-	 * Undomanager - begin a compound change
-	 * 
-	 * @param viewer
-	 */
-
-	private void beginCompoundChange(ISourceViewer viewer) {
-
-		if (viewer instanceof ITextViewerExtension)
-			((ITextViewerExtension) viewer).getRewriteTarget()
-					.beginCompoundChange();
-	}
-
-	/**
-	 * Get context
-	 * 
-	 * @param document
-	 * @param template
-	 * @param offset
-	 * @param length
-	 * @return the context
-	 */
-
-	private DocumentTemplateContext getContext(IDocument document,
-			Template template, final int offset, int length) {
-
-		TemplateContextType contextType = XPathUIPlugin.getDefault()
-				.getXPathTemplateContextRegistry().getContextType(
-						template.getContextTypeId());
-
-		return new DocumentTemplateContext(contextType, document, offset,
-				length);
-	}
-
-	/**
-	 * Get the xml identifier terminated at the given offset
-	 * 
-	 * @param document
-	 * @param template
-	 * @param offset
-	 * @param length
-	 * @return the identifier part
-	 * @throws BadLocationException
-	 */
-
-	private String getIdentifierPart(IDocument document, Template template,
-			int offset, int length) throws BadLocationException {
-		return getContext(document, template, offset, length).getKey();
-	}
-}
\ No newline at end of file
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 a2fe67a..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/util/XSLPluginImageHelper.java
+++ /dev/null
@@ -1,161 +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;
-
-	/**
-	 * 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(XSLUIPlugin.PLUGIN_ID, 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 777c388..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/DelegatingSourceValidatorForXSL.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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) - externalize strings
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.validation;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
-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.IMessage;
-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.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidator;
-import org.eclipse.wst.xsl.ui.internal.editor.XSLEditor;
-import org.eclipse.wst.xsl.ui.internal.quickassist.ValidationQuickAssist;
-
-/**
- * This performs the as-you-type validation for xsl files
- * 
- */
-public class DelegatingSourceValidatorForXSL extends DelegatingSourceValidator
-{
-	private static final String XSL_UI_XSL_EDITOR_ID = "org.eclipse.wst.xsl.ui.XSLEditor"; //$NON-NLS-1$
-	private final static String Id = "org.eclipse.wst.xsl.core.xsl"; //$NON-NLS-1$
-	private final String QUICKASSISTPROCESSOR = IQuickAssistProcessor.class.getName();
-	
-	private Validator _validator;
-
-	/**
-	 * Constructor
-	 */
-	public DelegatingSourceValidatorForXSL()
-	{
-		super();
-	}
-	
-	@Override
-	protected void updateValidationMessages(List messages, IDOMDocument document, IReporter reporter)
-	{
-		super.updateValidationMessages(messages, document, reporter);
-		// insert the quick assist information as an attribute for the messages
-//		for (Object msg : reporter.getMessages())
-//		{
-//			IMessage message = (IMessage)msg;
-//
-//			ValidationQuickAssist processor = new ValidationQuickAssist();
-//			
-//			String id = (String)message.getAttribute("validationErrorId");
-//			processor.setProblemId(id);
-//			
-//			message.setAttribute(QUICKASSISTPROCESSOR, processor);
-//		}		
-	}
-
-	@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.
-		// TODO resolve this when bug 247222 is sorted
-		
-		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), XSL_UI_XSL_EDITOR_ID, 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;
-	}
-
-	@Override
-	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 b185b8e..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/validation/XSLMarkupValidator.java
+++ /dev/null
@@ -1,95 +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)
-	 */
-	@Override
-	public void cleanup(IReporter reporter) {
-		// TODO Auto-generated method stub
-		super.cleanup(reporter);
-
-	}
-
-	/**
-	 * 
-	 * @param helper 
-	 * @param reporter 
-	 * @throws ValidationException 
-	 * 
-	 */
-	@Override
-	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)
-	 */
-	@Override
-	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)
-	 */
-	@Override
-	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)
-	 */
-	@Override
-	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 910a785..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileTemplatesWizardPage.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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 271916) STAR - externalize strings for New XSL.
- *******************************************************************************/
-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.IStructuredSelection;
-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.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.Messages;
-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 static final String XSL_UI_TEMPLATE_PREFERENCE_PAGE = "org.eclipse.wst.xsl.ui.template.preferencePage"; //$NON-NLS-1$
-	private static final String NEW_STYLESHEET_TEMPLATES_WIZARD_PAGE = "NewStylesheetTemplatesWizardPage"; //$NON-NLS-1$
-	private String fLastSelectedTemplateName;
-	private SourceViewer fPatternViewer;
-	private TableViewer fTableViewer;
-	private TemplateStore fTemplateStore;
-	private Button fUseTemplateButton;
-
-	public NewXSLFileTemplatesWizardPage()
-	{
-		super(NEW_STYLESHEET_TEMPLATES_WIZARD_PAGE, Messages.NewXSLSelectTemplate, null); 
-		setDescription(Messages.NewXSLTemplateDescription);
-	}
-
-	private void configureTableResizing(final Composite parent, final Table table, final TableColumn column1, final TableColumn column2)
-	{
-		parent.addControlListener(new ControlAdapter()
-		{
-			@Override
-			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(Messages.NewXSLUseTemplateButtonText);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
-		fUseTemplateButton.setLayoutData(data);
-		fUseTemplateButton.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			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(Messages.NewXSLLinkPreferencePage);
-		data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
-		link.setLayoutData(data);
-		link.addSelectionListener(new SelectionAdapter()
-		{
-			@Override
-			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(Messages.NewXSLColumnTemplateName);
-
-		TableColumn column2 = new TableColumn(table, SWT.NONE);
-		column2.setText(Messages.NewXSLColumnTemplateDescription);
-
-		fTableViewer = new TableViewer(table);
-		fTableViewer.setLabelProvider(new TemplateLabelProvider());
-		fTableViewer.setContentProvider(new TemplateContentProvider());
-
-		fTableViewer.setSorter(new ViewerSorter()
-		{
-			@Override
-			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);
-			}
-
-			@Override
-			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();
-
-			@Override
-			public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-				return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-			}
-
-			@Override
-			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(Messages.NewXSLTemplatePreviewTitle);
-		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 = XSL_UI_TEMPLATE_PREFERENCE_PAGE;
-		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$
-		}
-	}
-	
-
-}
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 764bbc3..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileWizard.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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 271883 - ArrayIndexOutOfBounds on New XSL with no projects
- *******************************************************************************/
-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.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.Messages;
-import org.eclipse.wst.xsl.ui.internal.XSLUIPlugin;
-
-public class NewXSLFileWizard extends Wizard implements INewWizard
-{
-	private NewXSLFileWizardPage fNewFilePage;
-	private NewXSLFileTemplatesWizardPage fNewFileTemplatesPage;
-	private IStructuredSelection fSelection;
-	private IWorkbench workbench;
-
-	@Override
-	public void addPages()
-	{
-		IStructuredSelection ssel = new StructuredSelection(IDE.computeSelectedResources(fSelection));
-		
-		fNewFilePage = new NewXSLFileWizardPage("NewFileCreationPage", ssel); //$NON-NLS-1$ 
-		fNewFilePage.setTitle(Messages.NewXSLFilePageTitle);
-		fNewFilePage.setDescription(Messages.NewXSLFilePageDescription);
-		addPage(fNewFilePage);
-
-		fNewFileTemplatesPage = new NewXSLFileTemplatesWizardPage();
-		addPage(fNewFileTemplatesPage);
-	}
-
-	public void init(IWorkbench aWorkbench, IStructuredSelection aSelection)
-	{
-		this.workbench = aWorkbench;
-		fSelection = aSelection;
-		setWindowTitle(Messages.NewXSLFilePageWindowTitle);
-	}
-
-	@Override
-	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 631c547..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/NewXSLFileWizardPage.java
+++ /dev/null
@@ -1,167 +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.IContainer;
-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;
-import org.eclipse.wst.xsl.ui.internal.Messages;
-
-class NewXSLFileWizardPage extends WizardNewFileCreationPage
-{
-	private static final String XSLExtension = ".xsl"; //$NON-NLS-1$
-	private IContentType fContentType;
-	private List fValidExtensions = null;
-
-	public NewXSLFileWizardPage(String pageName, IStructuredSelection selection)
-	{
-		super(pageName, selection);
-		// find an unused file name
-		setFileName(getUnusedFilename("NewStylesheet",selection)); //$NON-NLS-1$
-	}
-	
-	private String getUnusedFilename(String prefix, IStructuredSelection selection)
-	{
-		String name = prefix+XSLExtension;
-		if (selection.isEmpty())
-			return name;
-		Object element = selection.getFirstElement();
-		if (element instanceof IContainer)
-		{
-			IContainer c = (IContainer)element;
-			int i=0;
-			do
-			{
-				if (c.findMember(name) == null)
-					return name;
-				i++;
-				name = prefix+i+XSLExtension;
-			}
-			while(true);
-		}
-		return null;
-	}
-
-	@Override
-	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(Messages.NewXSLFileWizardExtensionError, 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(Messages.NewXSLFileAlreadExistsError);
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-	
-	String addDefaultExtension(String filename)
-	{
-		StringBuffer newFileName = new StringBuffer(filename);
-
-		String ext = "xsl"; //$NON-NLS-1$
-		newFileName.append("."); //$NON-NLS-1$
-		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/src/org/eclipse/wst/xsl/ui/internal/wizards/TemplateContentProvider.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/TemplateContentProvider.java
deleted file mode 100644
index 2fc45cb..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/TemplateContentProvider.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal.wizards;
-
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.xsl.ui.internal.XSLUIConstants;
-
-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;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/TemplateLabelProvider.java b/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/TemplateLabelProvider.java
deleted file mode 100644
index 7895263..0000000
--- a/bundles/org.eclipse.wst.xsl.ui/src/org/eclipse/wst/xsl/ui/internal/wizards/TemplateLabelProvider.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.wst.xsl.ui.internal.wizards;
-
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
-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 ""; //$NON-NLS-1$
-		}
-	}
-}
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.xalan/.classpath b/bundles/org.eclipse.wst.xsl.xalan/.classpath
deleted file mode 100644
index 8fdf8e9..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="src" path="src-debugger"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsl.xalan/.cvsignore b/bundles/org.eclipse.wst.xsl.xalan/.cvsignore
deleted file mode 100644
index 50b76ba..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-javaCompiler.xalan-debugger.jar.args
-build.xml
-xalan-debugger.jar
-temp.folder
diff --git a/bundles/org.eclipse.wst.xsl.xalan/.project b/bundles/org.eclipse.wst.xsl.xalan/.project
deleted file mode 100644
index 3c56bc2..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.xalan</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<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.xalan/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 8ba1309..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jan 03 22:24:50 EST 2008
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 50bc347..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Sun Dec 16 08:48:52 GMT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e1e68b9..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,24 +0,0 @@
-#Wed Jul 30 20:57:15 BST 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-bundle-classpath-entries=0
-compilers.p.missing-packages=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=1
-compilers.p.unknown-element=0
-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
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.xsl.xalan/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsl.xalan/META-INF/MANIFEST.MF
deleted file mode 100644
index e7bf3ef..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsl.xalan;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.wst.xsl.xalan.debugger;
-  uses:="org.eclipse.wst.xsl.debugger,
-   org.apache.xpath,
-   org.apache.xalan.trace,
-   javax.xml.transform,
-   org.apache.xalan.templates"
-Require-Bundle: org.apache.xalan;bundle-version="[2.7.0,2.8.0)",
- org.apache.xml.serializer;bundle-version="[2.7.0,2.8.0)",
- org.eclipse.wst.xsl.jaxp.debug;bundle-version="[1.0.0,2.0.0)";resolution:=optional
diff --git a/bundles/org.eclipse.wst.xsl.xalan/XalanAttributes.properties b/bundles/org.eclipse.wst.xsl.xalan/XalanAttributes.properties
deleted file mode 100644
index 151b5c7..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/XalanAttributes.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#    Doug Satchwell (Chase Technology Ltd) - initial API and implementation
-###############################################################################
-OPTIMIZE=http://xml.apache.org/xalan/features/optimize
-OPTIMIZE.TYPE=boolean
-OPTIMIZE.DESC=Optimize stylesheet processing. By default, this attribute is set to true. You may need to set it to false for tooling applications.
-
-INCREMENTAL=http://xml.apache.org/xalan/features/incremental
-INCREMENTAL.TYPE=boolean
-INCREMENTAL.DESC=Produce output incrementally, rather than waiting to finish parsing the input before generating any output. By default this attribute is set to false. You can turn this attribute on to transform large documents where the stylesheet structure is optimized to execute individual templates without having to parse the entire document.
-
-SOURCE_LOCATION=http://xml.apache.org/xalan/features/source_location
-SOURCE_LOCATION.TYPE=boolean
-SOURCE_LOCATION.DESC=By default, this attribute is set to false. Setting this attribute to true involves a substantial increase in storage cost per source document node. If you want to use the NodeInfo extension functions (or some other mechanism) to provide this information during a transform, you must set the attribute to true before generating the Transformer and processing the stylesheet.
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.xalan/XalanOutputProperties.properties b/bundles/org.eclipse.wst.xsl.xalan/XalanOutputProperties.properties
deleted file mode 100644
index ceeb071..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/XalanOutputProperties.properties
+++ /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
-###############################################################################
-S_KEY_INDENT_AMOUNT={http://xml.apache.org/xalan}indent-amount
-S_KEY_INDENT_AMOUNT.DESC=The non-standard property key to use to set the\n\
-	number of whitepaces to indent by, per indentation level,\n\
-    if indent="yes"
-
-S_KEY_LINE_SEPARATOR={http://xml.apache.org/xalan}line-separator
-S_KEY_LINE_SEPARATOR.DESC=The non-standard property key to use to set the characters to write out as at the end of a line,\n\
-	rather than the default ones from the runtime.
-
-S_KEY_CONTENT_HANDLER={http://xml.apache.org/xalan}content-handler
-S_KEY_CONTENT_HANDLER.DESC=This non-standard property key is used to set the name of the fully qualified\n\
-     Java class that implements the ContentHandler interface.\n\
-     Fully qualified name of class with a default constructor that\n\
-     implements the ContentHandler interface, where the result tree events\n\
-     will be sent to.
-
-S_KEY_ENTITIES={http://xml.apache.org/xalan}entities
-S_KEY_ENTITIES.DESC=This non-standard property key is used to specify the name of the property file\n\
-     that specifies character to entity reference mappings.
-
-S_USE_URL_ESCAPING={http://xml.apache.org/xalan}use-url-escaping
-S_USE_URL_ESCAPING.DESC=This non-standard property key is used to set a value of "yes" if the href values for HTML serialization should\n\
-     use %xx escaping.
-     
-S_OMIT_META_TAG={http://xml.apache.org/xalan}omit-meta-tag
-S_OMIT_META_TAG.DESC=This non-standard property key is used to set a value of "yes" if the META tag should be omitted where it would\n\
-     otherwise be supplied.
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.xalan/about.html b/bundles/org.eclipse.wst.xsl.xalan/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 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.xalan/build.properties b/bundles/org.eclipse.wst.xsl.xalan/build.properties
deleted file mode 100644
index db56c82..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.. = src-debugger/
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               .,\
-               XalanOutputProperties.properties,\
-               XalanAttributes.properties,\
-               about.html,\
-               plugin.properties
-
diff --git a/bundles/org.eclipse.wst.xsl.xalan/plugin.properties b/bundles/org.eclipse.wst.xsl.xalan/plugin.properties
deleted file mode 100644
index 3a739ee..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/plugin.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.xalan
-Bundle-Name.0 = XSL Xalan Support
-processorType.label.0 = Xalan
-processor.label.0 = Xalan 2.5.1
-processor.label.1 = Xalan 2.7.1
-Bundle-Vendor.0 = Eclipse.org
-transformerFactoryNameXalan = Interpretive
-transformerFactoryNameXalanXSLTC = Compiling
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsl.xalan/plugin.xml b/bundles/org.eclipse.wst.xsl.xalan/plugin.xml
deleted file mode 100644
index 6a60297..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/plugin.xml
+++ /dev/null
@@ -1,45 +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="XalanAttributes.properties"
-            id="org.eclipse.wst.xsl.xalan.processorType"
-            label="%processorType.label.0"
-            outputProperties="XalanOutputProperties.properties">
-         <transformerFactory
-               factoryClass="org.apache.xalan.processor.TransformerFactoryImpl"
-               name="%transformerFactoryNameXalan">
-         </transformerFactory>
-         <transformerFactory
-               factoryClass="org.apache.xalan.xsltc.trax.TransformerFactoryImpl"
-               name="%transformerFactoryNameXalanXSLTC">
-         </transformerFactory>
-      </processorType>
-   </extension>
-   <extension
-         point="org.eclipse.wst.xsl.jaxp.launching.debugger">
-      <debugger
-            className="org.eclipse.wst.xsl.xalan.debugger.XalanDebugger"
-            classpath="${eclipse_orbit:org.eclipse.wst.xsl.xalan}"
-            id="org.eclipse.wst.xsl.xalan.debugger"
-            name="Xalan 2.5.1 or greater"
-            processorTypeId="org.eclipse.wst.xsl.xalan.processorType"
-            transformerFactoryClass="org.apache.xalan.processor.TransformerFactoryImpl">
-      </debugger>
-   </extension>
-   <extension
-         point="org.eclipse.wst.xsl.jaxp.launching.processor">
-      <!-- An adopter can specify the ${eclipse_orbit: } variable to indicate which eclipse
-           bundle should be added to the class path. -->
-      <processor
-            classpath="${eclipse_orbit:org.apache.xalan};${eclipse_orbit:org.apache.xml.serializer};${eclipse_orbit:org.apache.bcel};${eclipse_orbit:java_cup.runtime}"
-            id="org.eclipse.wst.xsl.launching.xalan.processor"
-            label="%processor.label.1"
-            processorTypeId="org.eclipse.wst.xsl.xalan.processorType"
-            debuggerId="org.eclipse.wst.xsl.xalan.debugger"
-            supports="1.0">
-      </processor>
-   </extension>
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanDebugger.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanDebugger.java
deleted file mode 100644
index ef2eab3..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanDebugger.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.xalan.debugger;
-
-import java.util.TooManyListenersException;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xalan.processor.TransformerFactoryImpl;
-import org.apache.xalan.trace.TraceManager;
-import org.apache.xalan.transformer.TransformerImpl;
-import org.eclipse.wst.xsl.jaxp.debug.debugger.AbstractDebugger;
-import org.eclipse.wst.xsl.jaxp.debug.debugger.BreakPoint;
-import org.eclipse.wst.xsl.jaxp.debug.debugger.Variable;
-import org.xml.sax.SAXException;
-
-public class XalanDebugger extends AbstractDebugger
-{
-	private static final Log log = LogFactory.getLog(XalanDebugger.class);
-	private XalanTraceListener currentTraceListener;
-	private TransformerImpl lastTransformerInChain;
-	
-	public void setTransformerFactory(TransformerFactory factory)
-	{
-		TransformerFactoryImpl tfi = (TransformerFactoryImpl) factory;
-		tfi.setAttribute(TransformerFactoryImpl.FEATURE_SOURCE_LOCATION, Boolean.TRUE);
-		tfi.setAttribute(TransformerFactoryImpl.FEATURE_OPTIMIZE, Boolean.FALSE);
-	}
-	
-	public synchronized void debuggerSuspended(BreakPoint breakpoint)
-	{
-		// flush the serializer (which is buffered by Xalan itself)
-		try
-		{
-			lastTransformerInChain.getSerializationHandler().flushPending();
-		}
-		catch (SAXException e)
-		{
-			log.error("Error flushing serializer", e);
-		}
-		super.debuggerSuspended(breakpoint);
-	}
-
-	public void addTransformer(Transformer transformer)
-	{
-		TransformerImpl transformerImpl = (TransformerImpl) transformer;
-		
-		lastTransformerInChain = transformerImpl;
-		
-		TraceManager trMgr = transformerImpl.getTraceManager();
-		try
-		{
-//			XalanPrintTraceListener printer = new XalanPrintTraceListener(new PrintWriter(System.err));
-//			printer.m_traceElements = true;
-//			printer.m_traceSelection = true;
-//			printer.m_traceTemplates = true;
-//			trMgr.addTraceListener(printer);
-			
-			XalanTraceListener traceListener = new XalanTraceListener(this);
-			trMgr.addTraceListener(traceListener);
-		}
-		catch (TooManyListenersException e)
-		{
-			// ignore
-		}
-	}
-
-	/**
-	 * Gets a variable by ID
-	 * @since 1.0
-	 */
-	public Variable getVariable(int id)
-	{
-		return currentTraceListener.getVariable(id);
-	}
-
-	void setCurrentTraceListener(XalanTraceListener currentTraceListener)
-	{
-		log.debug("Setting new XalanTraceListener");
-		this.currentTraceListener = currentTraceListener;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanPrintTraceListener.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanPrintTraceListener.java
deleted file mode 100644
index 3d6c07d..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanPrintTraceListener.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.xalan.debugger;
-
-import java.io.PrintWriter;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTextLiteral;
-import org.apache.xalan.trace.EndSelectionEvent;
-import org.apache.xalan.trace.PrintTraceListener;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.trace.TracerEvent;
-
-public class XalanPrintTraceListener extends PrintTraceListener
-{
-	private final PrintWriter writer;
-
-	public XalanPrintTraceListener(PrintWriter pw)
-	{
-		super(pw);
-		this.writer = pw;
-	}
-
-	public void _trace(TracerEvent ev)
-	{
-		switch (ev.m_styleNode.getXSLToken())
-		{
-			case Constants.ELEMNAME_TEXTLITERALRESULT:
-				if (m_traceElements)
-				{
-					writer.print(ev.m_styleNode.getSystemId() + " Line #" + ev.m_styleNode.getLineNumber() + ", " + "Column #" + ev.m_styleNode.getColumnNumber() + " -- " + ev.m_styleNode.getNodeName()
-							+ ": ");
-
-					ElemTextLiteral etl = (ElemTextLiteral) ev.m_styleNode;
-					String chars = new String(etl.getChars(), 0, etl.getChars().length);
-
-					writer.println("    " + chars.trim());
-				}
-				break;
-			case Constants.ELEMNAME_TEMPLATE:
-				if (m_traceTemplates || m_traceElements)
-				{
-					ElemTemplate et = (ElemTemplate) ev.m_styleNode;
-
-					writer.print(et.getSystemId() + " Line #" + et.getLineNumber() + ", " + "Column #" + et.getColumnNumber() + ": " + et.getNodeName() + " ");
-
-					if (null != et.getMatch())
-					{
-						writer.print("match='" + et.getMatch().getPatternString() + "' ");
-					}
-
-					if (null != et.getName())
-					{
-						writer.print("name='" + et.getName() + "' ");
-					}
-
-					writer.println();
-				}
-				break;
-			default:
-				if (m_traceElements)
-				{
-					writer
-							.println(ev.m_styleNode.getSystemId() + " Line #" + ev.m_styleNode.getLineNumber() + ", " + "Column #" + ev.m_styleNode.getColumnNumber() + ": "
-									+ ev.m_styleNode.getNodeName());
-				}
-		}
-	}
-
-	public void selected(SelectionEvent ev) throws TransformerException
-	{
-		writer.print("selected: ");
-		super.selected(ev);
-	}
-	
-	public void selectEnd(EndSelectionEvent ev) throws TransformerException
-	{
-		writer.print("selectEnd: ");
-		super.selectEnd(ev);
-	}
-	
-	public void trace(TracerEvent ev)
-	{
-		writer.print("trace: ");
-		super.trace(ev);
-	}
-	
-	public void traceEnd(TracerEvent ev)
-	{
-		writer.print("traceEnd: ");
-		_trace(ev);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanRootStyleFrame.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanRootStyleFrame.java
deleted file mode 100644
index c65b71a..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanRootStyleFrame.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.xalan.debugger;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xalan.templates.ElemVariable;
-import org.apache.xalan.templates.StylesheetRoot;
-import org.apache.xalan.trace.TracerEvent;
-import org.apache.xpath.VariableStack;
-import org.eclipse.wst.xsl.jaxp.debug.debugger.Variable;
-
-public class XalanRootStyleFrame extends XalanStyleFrame
-{
-	private static final Log log = LogFactory.getLog(XalanRootStyleFrame.class);
-	private Map variables;
-	private ArrayList globals;
-
-	public XalanRootStyleFrame(TracerEvent event)
-	{
-		super(null, event);
-		fillGlobals(event);
-	}
-
-	protected List getGlobals()
-	{
-		return globals;
-	}
-	
-	private void fillGlobals(TracerEvent event)
-	{
-		VariableStack vs = event.m_processor.getXPathContext().getVarStack();
-	    StylesheetRoot sr = event.m_styleNode.getStylesheetRoot();
-	    Vector vars = sr.getVariablesAndParamsComposed();
-		variables = new HashMap(vars.size());
-		globals = new ArrayList(vars.size());
-	    int i = vars.size();
-	    while (--i >= 0)
-		{
-			ElemVariable variable = (ElemVariable) vars.elementAt(i);
-			XalanVariable xvar = new XalanVariable(this,vs,Variable.GLOBAL_SCOPE,i,variable);
-			addVariable(xvar);
-			globals.add(xvar);
-		}
-	}
-
-	/**
-	 * Gets a Variable by ID
-	 * @since 1.0
-	 */
-	public Variable getVariable(int id)
-	{
-//		log.debug("Getting variable with id "+id+" from variables "+variables.size());
-		return (Variable)variables.get(new Integer(id));
-	}
-
-	public void addVariable(XalanVariable xvar)
-	{
-//		log.debug("Adding variable index="+xvar.getSlotNumber()+" val="+xvar);
-//		variables.add(xvar.getSlotNumber(),xvar);
-		log.debug("Adding variable id="+xvar.getId());
-		variables.put(new Integer(xvar.getId()),xvar);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanStyleFrame.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanStyleFrame.java
deleted file mode 100644
index f725de2..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanStyleFrame.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.xalan.debugger;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import javax.xml.transform.SourceLocator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xalan.templates.ElemCallTemplate;
-import org.apache.xalan.templates.ElemTemplate;
-import org.apache.xalan.templates.ElemTemplateElement;
-import org.apache.xalan.templates.ElemVariable;
-import org.apache.xalan.trace.TracerEvent;
-import org.apache.xml.dtm.ref.DTMNodeProxy;
-import org.apache.xml.utils.QName;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.XPath;
-import org.eclipse.wst.xsl.jaxp.debug.debugger.StyleFrame;
-import org.eclipse.wst.xsl.jaxp.debug.debugger.Variable;
-import org.w3c.dom.Node;
-
-public class XalanStyleFrame extends StyleFrame
-{
-	private static final Log log = LogFactory.getLog(XalanStyleFrame.class);
-
-	private final Map varNames;
-	private final Stack eventStack = new Stack();
-	final TracerEvent event;
-	private int currentLine;
-	private XalanRootStyleFrame rootStyleFrame;
-
-	/**
-	 * @since 1.0
-	 */
-	public XalanStyleFrame(StyleFrame parent, TracerEvent event)
-	{
-		super(parent);
-		this.event = event;
-		if (parent != null)
-			this.varNames = new HashMap(((XalanStyleFrame) parent).varNames);
-		else
-			this.varNames = new HashMap();
-		pushElement(event);
-		findRootStyleFrame();
-	}
-
-	private void findRootStyleFrame()
-	{
-		XalanStyleFrame frame = this;
-		do
-		{
-			if (frame instanceof XalanRootStyleFrame)
-				rootStyleFrame = (XalanRootStyleFrame) frame;
-		}
-		while ((frame = (XalanStyleFrame) frame.getParent()) != null);
-	}
-
-	public String getFilename()
-	{
-		return event.m_styleNode.getStylesheet().getSystemId();
-	}
-
-	public String getName()
-	{
-		String name = event.m_styleNode.getNodeName();
-		if (event.m_styleNode instanceof ElemTemplate)
-		{
-			ElemTemplate et = (ElemTemplate) event.m_styleNode;
-			QName q = et.getName();
-			if (q != null)
-			{
-				name += " name=\"" + q.getLocalName() + "\"";
-			}
-			XPath xp = et.getMatch();
-			if (xp != null)
-			{
-				name += " match=\"" + xp.getPatternString() + "\"";
-			}
-		}
-		else if (event.m_styleNode instanceof ElemCallTemplate)
-		{
-			ElemCallTemplate et = (ElemCallTemplate) event.m_styleNode;
-			QName q = et.getName();
-			if (q != null)
-			{
-				name += " name=\"" + q.getLocalName() + "\"";
-			}
-		}
-		return name;
-	}
-
-	public List getVariableStack()
-	{
-		List vars = new ArrayList();
-		vars.addAll(getLocals());
-		vars.addAll(getGlobals());
-		return vars;
-	}
-
-	public int getCurrentLine()
-	{
-		return currentLine;
-	}
-
-	public void pushElement(TracerEvent e)
-	{
-		currentLine = e.m_styleNode.getLineNumber();
-		eventStack.push(e);
-		if (log.isDebugEnabled())
-			log.debug("Pushed element " + TracerEvent.printNode(e.m_styleNode) + " at line " + currentLine);
-	}
-
-	public TracerEvent popElement()
-	{
-		TracerEvent e = (TracerEvent) eventStack.pop();
-		currentLine = e.m_styleNode.getEndLineNumber();
-		if (log.isDebugEnabled())
-			log.debug("Popped element " + TracerEvent.printNode(e.m_styleNode) + " at line " + currentLine);
-
-		ElemTemplateElement element = e.m_styleNode;
-		String name = element.getNodeName();
-		log.debug(" name " + name);
-		if (name.equals("param") || name.equals("variable"))
-			addVariable((ElemVariable) e.m_styleNode);
-
-		return e;
-	}
-
-	public TracerEvent peekElement()
-	{
-		if (eventStack.isEmpty())
-			return null;
-		return (TracerEvent) eventStack.peek();
-	}
-
-	private void addVariable(ElemVariable variable)
-	{
-		String scope = variable.getIsTopLevel() ? Variable.GLOBAL_SCOPE : Variable.LOCAL_SCOPE;
-		VariableStack vs = event.m_processor.getXPathContext().getVarStack();
-		XalanVariable xvar = new XalanVariable(this, vs, scope, variable.getIndex(), variable);
-		rootStyleFrame.addVariable(xvar);
-		varNames.put(variable.getName(), xvar);
-	}
-
-	private List getLocals()
-	{
-		List locals = new ArrayList(varNames.values());
-		// sort by slotNumber
-		Collections.sort(locals);
-		return new ArrayList(varNames.values());
-	}
-
-	protected List getGlobals()
-	{
-		return rootStyleFrame.getGlobals();
-	}
-
-	public String getSourceFilename()
-	{
-		SourceLocator locator = getSourceLocator();
-		if (locator != null)
-			return locator.getSystemId();
-		return "";
-	}
-
-	public int getSourceCurrentLine()
-	{
-		SourceLocator locator = getSourceLocator();
-		if (locator != null)
-			return locator.getLineNumber();
-		return 0;
-	}
-	
-	private SourceLocator getSourceLocator()
-	{
-		Node sourceNode = event.m_sourceNode;
-        SourceLocator locator = null;
-		if (sourceNode instanceof DTMNodeProxy)
-		{
-			int nodeHandler = ((DTMNodeProxy) sourceNode).getDTMNodeNumber();
-			return ((DTMNodeProxy) sourceNode).getDTM().getSourceLocatorFor(nodeHandler);
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanTraceListener.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanTraceListener.java
deleted file mode 100644
index a89b321..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanTraceListener.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.xalan.debugger;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xalan.templates.Constants;
-import org.apache.xalan.trace.EndSelectionEvent;
-import org.apache.xalan.trace.ExtensionEvent;
-import org.apache.xalan.trace.GenerateEvent;
-import org.apache.xalan.trace.SelectionEvent;
-import org.apache.xalan.trace.TraceListenerEx2;
-import org.apache.xalan.trace.TracerEvent;
-import org.eclipse.wst.xsl.jaxp.debug.debugger.BreakPoint;
-import org.eclipse.wst.xsl.jaxp.debug.debugger.Variable;
-
-public class XalanTraceListener implements TraceListenerEx2 // TraceListenerEx3
-{
-	private static final Log log = LogFactory.getLog(XalanTraceListener.class);
-
-	private final XalanDebugger debugger;
-	private XalanRootStyleFrame rootStyleFrame;
-
-	public XalanTraceListener(XalanDebugger debugger)
-	{
-		this.debugger = debugger;
-	}
-
-	public void trace(TracerEvent ev)
-	{
-		XalanStyleFrame styleFrame = null;
-		if (rootStyleFrame == null)
-		{// this is the root of the stack
-			debugger.debuggerTransformStarted();
-			debugger.setCurrentTraceListener(this);
-			rootStyleFrame = new XalanRootStyleFrame(ev);
-			styleFrame = rootStyleFrame;
-			debugger.pushStyleFrame(styleFrame);
-		}
-		else if (ev.m_styleNode.getOwnerXSLTemplate() == ev.m_styleNode)
-		{// this is an xsl:template, so add to template stack
-			styleFrame = new XalanStyleFrame(debugger.peekStyleFrame(), ev);
-			debugger.pushStyleFrame(styleFrame);
-		}
-		else if (ev.m_styleNode.getXSLToken() != Constants.ELEMNAME_TEXTLITERALRESULT)
-		{// add to current template element stack
-			styleFrame = (XalanStyleFrame) debugger.peekStyleFrame();
-			styleFrame.pushElement(ev);
-		}
-		else
-		{
-			log.debug("Skipped push for element " + ev.m_styleNode.getLocalName());
-		}
-		check(styleFrame);
-	}
-
-	public void traceEnd(TracerEvent ev)
-	{
-		XalanStyleFrame styleFrame = (XalanStyleFrame) debugger.peekStyleFrame();
-		if (styleFrame != null)
-		{
-			if (ev.m_styleNode.getOwnerXSLTemplate() == ev.m_styleNode)
-			{// remove from current template element stack
-				styleFrame.popElement();
-			}
-			else if (ev.m_styleNode.getXSLToken() != Constants.ELEMNAME_TEXTLITERALRESULT)
-			{// remove from current template element stack
-				styleFrame.popElement();
-			}
-			else
-			{
-				log.debug("Skipped pop for element " + ev.m_styleNode.getLocalName());
-			}
-			check(styleFrame);
-			if (ev.m_styleNode.getOwnerXSLTemplate() == ev.m_styleNode)
-			{// end of template, so remove from stack
-				debugger.popStyleFrame();
-			}
-			else
-			{// because we don't get selectEnd events, we need to do this check
-				TracerEvent tel = styleFrame.peekElement();
-				// if the parent is a choose, move on to it
-				switch (tel.m_styleNode.getXSLToken())
-				{
-					case Constants.ELEMNAME_CHOOSE:
-						styleFrame.popElement();
-						check(styleFrame);
-				}
-			}
-		}
-	}
-
-	private void check(XalanStyleFrame styleFrame)
-	{
-		debugger.checkStopped();
-		if (styleFrame != null)
-		{
-			// check breakpoint in stylesheet
-			BreakPoint breakpoint = new BreakPoint(styleFrame.getFilename(), styleFrame.getCurrentLine());
-			debugger.checkSuspended(styleFrame, breakpoint);
-			// TODO check breakpoint in source
-			/*
-			 * breakpoint = new BreakPoint(styleFrame.getSourceFilename(), styleFrame.getSourceCurrentLine()); System.out.println("---------------"+breakpoint); if (breakpoint.getFile() != null)
-			 * debugger.checkSuspended(styleFrame, breakpoint);
-			 */}
-	}
-
-	public void selected(SelectionEvent ev) throws TransformerException
-	{
-	}
-
-	public void selectEnd(EndSelectionEvent ev) throws TransformerException
-	{
-	}
-
-	public void generated(GenerateEvent ev)
-	{
-//		XSLGenerateEvent event = new XSLGenerateEvent();
-//		event.m_characters = ev.m_characters;
-//		event.m_data = ev.m_data;
-//		event.m_eventtype = ev.m_eventtype;
-//		event.m_length = ev.m_length;
-//		event.m_name = ev.m_name;
-//		event.m_start = ev.m_start;
-//		
-//		if (ev.m_atts != null)
-//		{
-//			event.m_atts = new ArrayList();
-//			for (int i = 0; i < ev.m_atts.getLength(); i++)
-//			{
-//				String attName = ev.m_atts.getQName(i);
-//				String attValue = ev.m_atts.getValue(i);
-//				XSLElementAttribute xatt = new XSLElementAttribute(attName,attValue);
-//				event.m_atts.add(xatt);
-//			}			
-//		}
-//		
-//		debugger.generated(event);
-	}
-
-	public void extension(ExtensionEvent ee)
-	{
-	}
-
-	public void extensionEnd(ExtensionEvent ee)
-	{
-	}
-
-	/**
-	 * @since 1.0
-	 */
-	public Variable getVariable(int id)
-	{
-		return rootStyleFrame.getVariable(id);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanVariable.java b/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanVariable.java
deleted file mode 100644
index 640a74c..0000000
--- a/bundles/org.eclipse.wst.xsl.xalan/src-debugger/org/eclipse/wst/xsl/xalan/debugger/XalanVariable.java
+++ /dev/null
@@ -1,218 +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 214235 - Allows nodes to be expanded.
- *******************************************************************************/
-package org.eclipse.wst.xsl.xalan.debugger;
-
-import javax.xml.transform.TransformerException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.xalan.templates.ElemVariable;
-import org.apache.xpath.VariableStack;
-import org.apache.xpath.objects.XNodeSet;
-import org.apache.xpath.objects.XObject;
-import org.eclipse.wst.xsl.jaxp.debug.debugger.Variable;
-import org.w3c.dom.Attr;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-
-public class XalanVariable extends Variable implements Comparable {
-	private final Log log = LogFactory.getLog(XalanVariable.class);
-	private final ElemVariable elemVariable;
-	private final VariableStack varStack;
-	private int stackFrame;
-	private XObject xobject;
-
-	public XalanVariable(XalanStyleFrame xalanStyleFrame,
-			VariableStack varStack, String scope, int slotNumber,
-			ElemVariable elemVariable) {
-		super(getName(elemVariable, scope, xalanStyleFrame), scope, slotNumber
-				+ varStack.getStackFrame());
-		this.elemVariable = elemVariable;
-		this.varStack = varStack;
-		// get the stack frame at this current point in time
-		this.stackFrame = varStack.getStackFrame();
-		try {
-			xobject = getXObject();
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-
-	private static String getName(ElemVariable elemVariable, String scope,
-			XalanStyleFrame xalanStyleFrame) {
-		String name = elemVariable.getName().getLocalName();
-		String systemId = elemVariable.getStylesheet().getSystemId();
-		if (GLOBAL_SCOPE.equals(scope) && systemId != null) {
-			int index;
-			if ((index = systemId.lastIndexOf('/')) > 0)
-				name += " (" + systemId.substring(index + 1) + ")";
-			else
-				name += " (" + systemId + ")";
-		}
-		// else if (LOCAL_SCOPE.equals(scope))
-		// {
-		// name += " (" + xalanStyleFrame.getName() + ")";
-		// }
-		return name;
-	}
-
-	public String getType() {
-		String value = UNKNOWN;
-		// XObject xobject = getXObject();
-		if (xobject != null) {
-			int xalanType = xobject.getType();
-			switch (xalanType) {
-			case XObject.CLASS_UNRESOLVEDVARIABLE:
-				value = UNRESOLVED;
-				break;
-			case XObject.CLASS_NODESET:
-				value = NODESET;
-				break;
-			case XObject.CLASS_BOOLEAN:
-				value = BOOLEAN;
-				break;
-			case XObject.CLASS_NUMBER:
-				value = NUMBER;
-				break;
-			case XObject.CLASS_UNKNOWN:
-				value = UNKNOWN;
-				break;
-			case XObject.CLASS_STRING:
-			default:
-				value = STRING;
-				break;
-			}
-		}
-		// catch (TransformerException e)
-		// {
-		// e.printStackTrace();
-		// }
-		return value;
-	}
-
-	public String getValue() {
-		String value = "???";
-		try {
-			xobject = getXObject();
-			if (xobject != null) {
-				int xalanType = xobject.getType();
-				switch (xalanType) {
-				case XObject.CLASS_UNRESOLVEDVARIABLE:
-					value = "";
-					break;
-				case XObject.CLASS_NODESET:
-					XNodeSet xns = (XNodeSet) xobject;
-					if (xns.nodelist().getLength() > 0) {
-					    value = convertNode(xns);
-					}
-					else
-						value = "<EMPTY NODESET>";
-					break;
-				case XObject.CLASS_BOOLEAN:
-				case XObject.CLASS_NUMBER:
-				case XObject.CLASS_STRING:
-				case XObject.CLASS_UNKNOWN:
-				default:
-					value = xobject.toString();
-					break;
-				}
-			}
-		} catch (TransformerException e) {
-			e.printStackTrace();
-		}
-		// value = getScope()+"."+getSlotNumber()+")"+getName();
-		// log.debug(getScope()+"."+getSlotNumber()+")"+getName() + "=" +
-		// value);
-		return value;
-	}
-
-	private String convertNode(XNodeSet xns) throws TransformerException {
-		NodeList nodeList = xns.nodelist();
-		String value = processNodeList(nodeList);
-		return value;
-	}
-
-	private String processNodeList(NodeList nodeList) {
-		String value = "";
-		for (int i = 0; i < nodeList.getLength(); i++) {
-			Node node = nodeList.item(i);
-			int nodeType = node.getNodeType();
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				value = createElement(value, node);
-			}
-			if (nodeType == Node.COMMENT_NODE ) {
-				value = value + "<!-- " + node.getNodeValue() + " -->";
-			}
-			if (nodeType == Node.PROCESSING_INSTRUCTION_NODE) {
-				ProcessingInstruction pi = (ProcessingInstruction) node;
-				value = value + "<?" + pi.getData() + " ?>";
-			}
-		}
-		return value;
-	}
-
-	private String createElement(String value, Node node) {
-		value = value + "<";
-//		if (node.getPrefix() != null && node.getPrefix().length() > 0) {
-//			value = value + node.getPrefix() + ":";
-//		}
-		if (node.getNodeName() != null) {
-			value = value + node.getNodeName();
-			if (node.hasAttributes()) {
-				NamedNodeMap attr = node.getAttributes();
-				value = value + buildAttributes(attr);
-			}
-			value = value + ">";
-			if (node.getNodeValue() != null) {
-				value = value + node.getNodeValue();
-			}
-		}
-		if (node.hasChildNodes()) {
-			value = value + processNodeList(node.getChildNodes());
-		}
-		value = value + "</" + node.getNodeName() + ">";
-		return value;
-	}
-	
-	private String buildAttributes(NamedNodeMap attributes) {
-		String value = " ";
-		for (int a = 0; a < attributes.getLength(); a++) {
-			Attr attribute = (Attr)attributes.item(a);
-//			if (attribute.getPrefix() != null) {
-//				value = value + attribute.getPrefix() + ":";
-//			}
-			value = value + attribute.getName() + "=\"" + attribute.getValue() + "\" ";
-		}
-		value = value + " ";
-		return value;
-	}
-
-	private XObject getXObject() throws TransformerException {
-		XObject xvalue;
-		if (elemVariable.getIsTopLevel())
-			xvalue = varStack.elementAt(slotNumber);
-		else
-			xvalue = varStack.getLocalVariable(elemVariable.getIndex(),
-					stackFrame);
-		return xvalue;
-	}
-
-	public int compareTo(Object arg0) {
-		XalanVariable xvar = (XalanVariable) arg0;
-		int comp = xvar.stackFrame - stackFrame;
-		if (comp == 0)
-			comp = slotNumber - xvar.slotNumber;
-		return comp;
-	}
-}
diff --git a/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 3090c89..0000000
--- a/bundles/org.eclipse.wst.xsl/about.ini
+++ /dev/null
@@ -1,11 +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 "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
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 15f32ab..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=Eclipse XSL Developer 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 1694922..0000000
--- a/bundles/org.eclipse.wst.xsl/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = META-INF/,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               plugin.properties,\
-               icons/
diff --git a/bundles/org.eclipse.wst.xsl/icons/WTP_icon_x32_v2.png b/bundles/org.eclipse.wst.xsl/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/bundles/org.eclipse.wst.xsl/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsl/plugin.properties b/bundles/org.eclipse.wst.xsl/plugin.properties
deleted file mode 100644
index a240e51..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 Web Tools Platform
-Bundle-Name.0 = Eclipse XSL Developer Tools
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/.cvsignore b/docs/org.eclipse.wst.xsl.doc/.cvsignore
deleted file mode 100644
index ae93dfd..0000000
--- a/docs/org.eclipse.wst.xsl.doc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-xinclude
-test.xml
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 3bb2901..0000000
--- a/docs/org.eclipse.wst.xsl.doc/build.xml
+++ /dev/null
@@ -1,46 +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}"/>
-	
-	<taskdef name="xsl.include" classname="org.eclipse.wst.xsl.core.internal.ant.XIncludeTask"/>
-	
-	<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"/>
-			<param name="chunk.section.depth" expression="3"/>
-			<param name="toc.section.depth" expression="5"/>
-			<param name="toc.list.type" expression="ul"/>
-		</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 2fc9053..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/concepts/RescuingXSLTfromNicheStatus.xml
+++ /dev/null
@@ -1,494 +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"?>
-<member level="platinum">
-  <name>Jeff</name>
-  <phone type="home">555-1234</phone>
-  <phone type="work">555-4321</phone>
-  <favoriteColor>blue</favoriteColor>
-</member>]]>      
-      </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 40e3400..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/concepts/concepts.xml
+++ /dev/null
@@ -1,41 +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>
-         If you are new to XSLT or just need a refresher then this section may
-         help get you going.
-   </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 0e15318..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/concepts/gettingstarted.xml
+++ /dev/null
@@ -1,22 +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>  
-      XSLT stands for the eXtensible Stylesheet Language Transformations. It is
-      part of the XSL specification which includes the transformation and formatting objects
-      (XSL-FO).   XSL Tools primarily deals with the editing, launching, and debugging
-      of XSL Style sheets.
-   </para>
-   <itemizedlist>
-   		<title>Getting Started</title>
-   		<listitem>
-   			<para><ulink url="../concepts/concepts.html">Rescuing XSLT From Niche Status</ulink> - gives a basic introduction to XSLT from the point of view of creating HTML output.</para>
-   		</listitem>
-   		<listitem>
-   			<para><ulink url="http://www.mulberrytech.com/quickref/">XSLT and XPath Quick Reference Cards</ulink> - a set of PDF files that can be printed to provide quick references to the XSLT and XPath commands.</para>
-   		</listitem>
-   </itemizedlist>
-</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 0528abd..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/editor/editor.xml
+++ /dev/null
@@ -1,382 +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">
-<?dbhtml filename="editor/xsleditor_contentassist_xsl.html" ?>
-        
-            <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">
-<?dbhtml filename="editor/xsleditor_contentassist_selecttest.html" ?>
-            <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">
-<?dbhtml filename="editor/xsleditor_contentassist_exclude.html" ?>
-        
-            <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">
-<?dbhtml filename="editor/xsleditor_contentassist_modeassist.html" ?>
-        
-            <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">
-<?dbhtml filename="editor/xsleditor_contentassist_namedtemplate.html" ?>
-        
-            <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">
-<?dbhtml filename="editor/xsleditor_contentassist_calltemplate.html" ?>
-        
-            <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">
-<?dbhtml filename="editor/xsleditor_contentassist_include.html" ?>
-        
-            <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">
-<?dbhtml filename="editor/xsleditor_contentassist_xsltOverride.html" ?>
-        
-            <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/templatesView.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/templatesView.png
deleted file mode 100644
index a1e20d9..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/editor/templatesView.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/XSLDebugging.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/XSLDebugging.png
deleted file mode 100644
index 5cb456e..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/XSLDebugging.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/XSLOutputTab.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/XSLOutputTab.png
deleted file mode 100644
index 380e55e..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/XSLOutputTab.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/XSLProcessorTab.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/XSLProcessorTab.png
deleted file mode 100644
index e86f973..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/XSLProcessorTab.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/XSLRunDebugConfigurations.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/XSLRunDebugConfigurations.png
deleted file mode 100644
index 675a64f..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/XSLRunDebugConfigurations.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/nodesetVariable.png b/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/nodesetVariable.png
deleted file mode 100644
index d3ca7ff..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/images/launching/nodesetVariable.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 841a62d..0000000
--- a/docs/org.eclipse.wst.xsl.doc/docbook/launching/launching.xml
+++ /dev/null
@@ -1,346 +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>
-		<figure
-			id="fig_XSLRun">
-			<title>XSLT Run/Debug</title>
-			<mediaobject>
-				<imageobject>
-					<imagedata
-						align="center"
-						format="PNG"
-						fileref="../images/launching/launchShortct.png" />
-				</imageobject>
-			</mediaobject>
-		</figure>
-		<note>
-			<title>Selecting only the XSL Stylesheet</title>
-			<para>
-				If only the XSL Stylesheet is selected then a dialog box will prompt you for the input file to use.
-			</para>
-		</note>
-		<para>
-			Launch can also be done through the Launch Configurations pages that are used for both debugging and normal transformations.
-			These configurations can be accessed through <emphasis>Run->Run Configurations</emphasis> menu bar option.
-		</para>
-		<section
-			id="XSLLaunchConfig">
-			<title>Launch Configuration</title>
-			<para>
-				Currently, XSL Tools only supports the launching of java based
-				processors through the Run and Debug framework. To this point, it
-				leverages and extends some of the support provided by the Java
-				launch configurations. XSL Tools does add it's own specific features
-				for launching.
-			</para>
-			<figure
-				id="fig_XSLLaunchConfig">
-				<title>Java XSLT Launch Configuration</title>
-				<mediaobject>
-					<imageobject>
-						<imagedata
-							align="center"
-							format="PNG"
-							fileref="../images/launching/XSLRunDebugConfigurations.png" />
-					</imageobject>
-				</mediaobject>
-			</figure>
-			<para>
-				The tabs Main, Output, and Processor control specifics for the XSLT processor and files to be run through
-				the transformation.
-			</para>
-			<note>
-				<title>XSLT Extensions</title>
-				<para>If the transformation needs or makes use of extension
-					functions then those jar files should be added to the Classpath tab
-					so that they are picked up during the transformation. Otherwise the
-					transformation will fail.</para>
-			</note>
-			<section id="XSLLaunch_Main">
-				<title>Main Tab</title>
-				<para>
-					As shown in <xref linkend="fig_XSLLaunchConfig"/>, the Main Tab is where the input XML file is specified.  If a particular
-					XML file is not shown in the available list when browsing the Workspace, make sure that it is added to under the XML Content
-					Type in the General preference page.  Standard eclipse launching variables can be used to specify the location of the input file.
-				</para>
-				<para>
-					A run configuration can also use a simple pipeline transformation.  Meaning that the output from one stylesheet is used as input
-					to the next stylesheet.   The Stylesheet input box can have one to many stylesheets specified.  At least one stylesheet is required
-					for a transformation.
-				</para>
-				<para>
-					The last optional item are parameters.   Stylesheets can have parameters passed into them to setup configuration information.  An
-					example would be the numerous parameters that can be set for a DocBook stylesheet transformation.   If the parameters are not
-					specified the defaults that are defined in the stylesheet will take precedence. 
-				</para>
-			</section>
-			<section id="XSLLaunch_Output">
-				<title>Output Tab</title>
-				<para>
-					The Output Tab allows the specification of where the transformation should store the information.
-					This can be relative to the workspace or a physical location outside the workspace.
-				</para>
-			<figure
-				id="fig_XSLOutputTab">
-				<title>Java XSLT Launch Configuration</title>
-				<mediaobject>
-					<imageobject>
-						<imagedata
-							align="center"
-							format="PNG"
-							fileref="../images/launching/XSLOutputTab.png" />
-					</imageobject>
-				</mediaobject>
-			</figure>
-				
-			</section>
-			<section id="XSLLaunch_Processor">
-				<title>Processor Tab</title>
-				<para>
-					The particular XSLT processor that will be used can be choosen from this tab. The
-					default is to use the system default processor or what ever processor you have
-					set as the default processor in the preference pages.
-				</para>
-				<figure
-					id="fig_XSLProcessorTab">
-					<title>Java XSLT Launch Configuration</title>
-					<mediaobject>
-						<imageobject>
-							<imagedata
-								align="center"
-								format="PNG"
-								fileref="../images/launching/XSLProcessorTab.png" />
-						</imageobject>
-					</mediaobject>
-				</figure>
-				
-				<note>
-					<title>XSLT Debugging</title>
-					<para>
-						If you are setting up a launch configuration for debugging, do not choose
-						the JRE Default processor, you should choose either Xalan or another adopters
-						processor that supports debugging.
-					</para>
-				</note>
-				<para>
-					In addition, every processor has their own configuration options that can be specified.
-					This controls such items as indentation, handling of white space, etc.  Refer to your
-					processors documentation for the specific options available.
-				</para>
-			</section>
-		</section>
-	</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. The XSL Tools
-			debugger leverages the existing eclipse platform Debug View</para>
-		<figure id="fig_XSLDebug">
-			<title>XSLT Debugging</title>
-				<mediaobject>
-					<imageobject>
-						<imagedata
-							align="center"
-							format="PNG"
-							fileref="../images/launching/XSLDebugging.png" />
-					</imageobject>
-				</mediaobject>
-		</figure>
-		<para>
-			How the debugger acts will depend on the processor being used. Not
-			all XSLT processors pass the same type of information to the
-			debugger. These differences will be noted in the
-			<xref
-				linkend="XSLDebugProcessorSpecific" />
-			section.
-		</para>
-		<section
-			id="DebugGettingStarted">
-			<?dbhtml filename="launching/debugging_gettingStarted.html" ?>
-			<title>Starting a Debug Session</title>
-			<para> Debugging is started the same way as launching an XSL
-				Tranformation is done. Except that the debug configuration is used
-				instead of the normal launch configuration. If a debugging session
-				is started on a processor that does not support debugging, a dialog
-				will ask if you want to switch to one of the supported debuggers.
-			</para>
-			<note>
-				<title>Default JRE</title>
-				<para> The default JRE does not have built in support for debugging,
-					even though it is based on Apache Xalan. It is recommended to use
-					Xalan or another processor provided by an adopter to do your
-					transformations. The default processor is known to have some issues
-					that Xalan and other processors do not have.</para>
-			</note>
-		</section>
-		<section
-			id="XSLDebugCommon">
-		<?dbhtml filename="launching/debugging_common.html" ?>
-			<title>Common Debugging Operations</title>
-			<para>
-				XSLT debugging is handled by the eclipse platforms debugging
-				framework support as outlined in the
-				<ulink
-					url="/help/topic/org.eclipse.platform.doc.isv/guide/debug_debug.htm">"Program Debug and Launch Support"</ulink>
-				. Common operations like stepping into (F5), stepping over (F6),
-				pausing, running to a breakpoint, and relaunching are supported. In
-				addition to the standard Variable and Breakpoint views provided by
-				the platform, there are some XSLT specific views and functionality
-				as well. All of these are common regardless of the particular XSLT
-				debugger being used.
-			</para>
-			<tip>
-				<title>Introduction to Eclipse Debugging</title>
-				<para>
-					<ulink
-						url="http://www.mcs.vuw.ac.nz/courses/COMP205/2007T1/tools/eclipse/debugging/basics.shtml">Basic Debugging in Eclipse</ulink>
-					contains a good general introduction to the basic features provided
-					by the Eclipse Debug view. XSL Tools leverages many of these
-					features and the same concepts apply to the XSL Tools debugger.
-				</para>
-			</tip>
-			<para> In addition to the standard features and functionality, the
-				XSL Tools debugging support adds the following additional items:
-			</para>
-			<itemizedlist>
-				<listitem>
-					<para> Result View</para>
-				</listitem>
-				<listitem>
-					<para>XSLT specific Variables</para>
-				</listitem>
-				<listitem>
-					<para>XSLT Processor Specific Functionality</para>
-				</listitem>
-			</itemizedlist>
-			<section
-				id="XSLDebugResultView">
-			<?dbhtml filename="launching/debugging_resultview.html" ?>
-				<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>
-				<para> The result view is updated throughout the debugging process,
-					and is useful to help see what output is generated at specific
-					points during a transformation.</para>
-			</section>
-			<section
-				id="XSLDebugVariables">
-			<?dbhtml filename="launching/debugging_variablesview.html" ?>
-				<title>Variables View</title>
-				<para> The variables view will show all the local and global
-					variables and params that are currently in scope. There are two
-					types of variables that can be views.</para>
-				<mediaobject>
-					<imageobject>
-						<imagedata
-							align="center"
-							format="PNG"
-							fileref="../images/launching/nodesetVariable.png" />
-					</imageobject>
-				</mediaobject>
-				<itemizedlist>
-					<title>Variable Types</title>
-					<listitem>
-						<para>
-							<emphasis>String</emphasis>
-							- These contain text values. This could be strings of text,
-							numbers, or other characters.
-						</para>
-					</listitem>
-					<listitem>
-						<para>
-							<emphasis>Nodesets</emphasis>
-							- Nodesets are represented in the variables view as expandable
-							variables. They contain sequences of nodes. The type of nodes are
-							represented by icons for elements, attributes, text, comments or
-							processing instructions.
-						</para>
-					</listitem>
-				</itemizedlist>
-				<note>
-					<title>Can I change the value of variables?</title>
-					<para> Currently the XSLT Debugger does not support changing the
-						values or contents of a variable. All XSLT variables are read
-						only.</para>
-				</note>
-			</section>
-		</section>
-		<section
-			id="XSLDebugProcessorSpecific">
-			<?dbhtml filename="launching/debugging_processors.html" ?>
-			<title>XSLT Processor Specific Support</title>
-			<para> Various XSLT processors provide various levels of debugging
-				support. Many do not provide support for debugging of stylesheets,
-				and thus can't be used for debugging. XSL Tools provides basic
-				support for Xalan, and can be used as a guide for adopters on how to
-				implement their own specific debugging support for other processors.
-			</para>
-			<section
-				id="XSLDebugXalan">
-				<title>XSL Debugging with Xalan</title>
-				<para> Xalan provides general stylesheet execution and evalation
-					functionality. However there are a few things that Xalan does not
-					suppor that other processors do.</para>
-				<orderedlist>
-					<title>Xalan Debugging Issues</title>
-					<listitem>
-						<para>
-							<emphasis>Breakpoints</emphasis>
-							- Xalan does not support stopping at Global Variables or
-							Parameters when a debugging session is started. It will
-							automatically start at the first template. Break points must be
-							placed in templates to be honored. The reason for this is that
-							Xalan lazily initializes the variables only when they are first
-							used.
-						</para>
-					</listitem>
-					<listitem>
-						<para>
-							<emphasis>XSLT Text elements</emphasis>
-							- Xalan does not send notifications of xsl:text elements. These
-							are skipped over when debugging.
-						</para>
-					</listitem>
-					<listitem>
-						<para>
-							<emphasis>Built In Templates</emphasis>
-							- Xalan does provide notification when the built in templates are
-							called, but currently the debugger does not support or display
-							stepping into these templates.
-						</para>
-					</listitem>
-				</orderedlist>
-			</section>
-		</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 4470798..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/concepts/concepts.html
+++ /dev/null
@@ -1,411 +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="N10028"></a>XSLT Concepts</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><ul><li><span class="section"><a href="concepts.html#ResucingXSLT">Rescuing XSLT From Niche Status</a></span><ul><li><span class="section"><a href="concepts.html#N10043">The Problem</a></span></li><li><span class="section"><a href="concepts.html#N10069">The Solution</a></span></li><li><span class="section"><a href="concepts.html#N10090">Queries</a></span><ul><li><span class="section"><a href="concepts.html#N1009E">xsl:for-each</a></span></li><li><span class="section"><a href="concepts.html#N100AA">xsl:if</a></span></li><li><span class="section"><a href="concepts.html#N100B4">xsl:choose</a></span></li></ul></li><li><span class="section"><a href="concepts.html#N100BE">Conclusion</a></span></li></ul></li><li><span class="section"><a href="resources.html">Resources</a></span></li></ul></div><p>
-         If you are new to XSLT or just need a refresher then this section may
-         help get you going.
-   </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="N10043"></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="N10069"></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;member level="platinum"&gt;
-  &lt;name&gt;Jeff&lt;/name&gt;
-  &lt;phone type="home"&gt;555-1234&lt;/phone&gt;
-  &lt;phone type="work"&gt;555-4321&lt;/phone&gt;
-  &lt;favoriteColor&gt;blue&lt;/favoriteColor&gt;
-&lt;/member&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="N10090"></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="N1009E"></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="N100AA"></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="N100B4"></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="N100BE"></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 c18bbaa..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="N100F3"></a>XSL Editing</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><ul><li><span class="section"><a href="xsleditor.html#Validation">Validation</a></span></li><li><span class="section"><a href="xsleditor_contentassist.html">Content Assist</a></span><ul><li><span class="section"><a href="xsleditor_contentassist.html#ed_XSLProposals">XSLT Element Proposals</a></span></li><li><span class="section"><a href="xsleditor_contentassist_selecttest.html">Select, Test, and Match Attributes</a></span></li><li><span class="section"><a href="xsleditor_contentassist_exclude.html">Exclude-Result-Prefixes</a></span></li><li><span class="section"><a href="xsleditor_contentassist_modeassist.html">Mode attribute assistance</a></span></li><li><span class="section"><a href="xsleditor_contentassist_namedtemplate.html">Named Template Assistance</a></span></li><li><span class="section"><a href="xsleditor_contentassist_calltemplate.html">Call-Template Assistance</a></span></li><li><span class="section"><a href="xsleditor_contentassist_include.html">
-                Include and Import
-                href
-                Assistance
-            </a></span></li></ul></li><li><span class="section"><a href="xsleditor_templates.html">Templates</a></span><ul><li><span class="section"><a href="xsleditor_templates.html#N101E2">XPath Templates</a></span></li></ul></li><li><span class="section"><a href="xsleditor_coloring.html">XSLT Syntax Coloring</a></span></li><li><span class="section"><a href="xsleditor_markers.html">XSLT Markers and Annotations</a></span><ul><li><span class="section"><a href="xsleditor_markers.html#xsltOverRide">Template Override</a></span></li></ul></li><li><span class="section"><a href="xsleditor_debugging.html">XSL Debugging</a></span></li><li><span class="section"><a href="xsleditor_debugging.html">Navigation</a></span></li></ul></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 eb5c3dc..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist.html
+++ /dev/null
@@ -1,19 +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_contentassist_selecttest.html" title="Select, Test, and Match Attributes"></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></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_calltemplate.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_calltemplate.html
deleted file mode 100644
index f74ff33..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_calltemplate.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Call-Template Assistance</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_contentassist.html" title="Content Assist"><link rel="prev" href="xsleditor_contentassist_namedtemplate.html" title="Named Template Assistance"><link rel="next" href="xsleditor_contentassist_include.html" title="Include and Import href Assistance"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><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></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_exclude.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_exclude.html
deleted file mode 100644
index 4f6cdab..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_exclude.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Exclude-Result-Prefixes</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_contentassist.html" title="Content Assist"><link rel="prev" href="xsleditor_contentassist_selecttest.html" title="Select, Test, and Match Attributes"><link rel="next" href="xsleditor_contentassist_modeassist.html" title="Mode attribute assistance"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><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_exclude.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></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_include.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_include.html
deleted file mode 100644
index 1e15b77..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_include.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Include and Import href Assistance</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_contentassist.html" title="Content Assist"><link rel="prev" href="xsleditor_contentassist_calltemplate.html" title="Call-Template Assistance"><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><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></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_modeassist.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_modeassist.html
deleted file mode 100644
index 1fc65b0..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_modeassist.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Mode attribute assistance</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_contentassist.html" title="Content Assist"><link rel="prev" href="xsleditor_contentassist_exclude.html" title="Exclude-Result-Prefixes"><link rel="next" href="xsleditor_contentassist_namedtemplate.html" title="Named Template Assistance"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><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></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_namedtemplate.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_namedtemplate.html
deleted file mode 100644
index 6b87501..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_namedtemplate.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Named Template Assistance</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_contentassist.html" title="Content Assist"><link rel="prev" href="xsleditor_contentassist_modeassist.html" title="Mode attribute assistance"><link rel="next" href="xsleditor_contentassist_calltemplate.html" title="Call-Template Assistance"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><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></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_selecttest.html b/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_selecttest.html
deleted file mode 100644
index 5541807..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/editor/xsleditor_contentassist_selecttest.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Select, Test, and Match Attributes</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_contentassist.html" title="Content Assist"><link rel="prev" href="xsleditor_contentassist.html" title="Content Assist"><link rel="next" href="xsleditor_contentassist_exclude.html" title="Exclude-Result-Prefixes"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><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></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 5403388..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="N10232"></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 2cf698b..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_include.html" title="Include and Import href Assistance"><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="N101E2"></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 f05184e..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="N1041E"></a>General</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><ul><li><span class="section"><a href="general.html#XInclude">XInclude</a></span></li></ul></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="N10449"></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/templatesView.png b/docs/org.eclipse.wst.xsl.doc/html/images/editor/templatesView.png
deleted file mode 100644
index a1e20d9..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/editor/templatesView.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/XSLDebugging.png b/docs/org.eclipse.wst.xsl.doc/html/images/launching/XSLDebugging.png
deleted file mode 100644
index 5cb456e..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/launching/XSLDebugging.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/launching/XSLOutputTab.png b/docs/org.eclipse.wst.xsl.doc/html/images/launching/XSLOutputTab.png
deleted file mode 100644
index 380e55e..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/launching/XSLOutputTab.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/launching/XSLProcessorTab.png b/docs/org.eclipse.wst.xsl.doc/html/images/launching/XSLProcessorTab.png
deleted file mode 100644
index e86f973..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/launching/XSLProcessorTab.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsl.doc/html/images/launching/XSLRunDebugConfigurations.png b/docs/org.eclipse.wst.xsl.doc/html/images/launching/XSLRunDebugConfigurations.png
deleted file mode 100644
index 675a64f..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/launching/XSLRunDebugConfigurations.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/nodesetVariable.png b/docs/org.eclipse.wst.xsl.doc/html/images/launching/nodesetVariable.png
deleted file mode 100644
index d3ca7ff..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/images/launching/nodesetVariable.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 e53954b..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><ul><li><span class="chapter"><a href="introduction/gettingstarted.html">Getting Started</a></span></li><li><span class="chapter"><a href="concepts/concepts.html">XSLT Concepts</a></span><ul><li><span class="section"><a href="concepts/concepts.html#ResucingXSLT">Rescuing XSLT From Niche Status</a></span><ul><li><span class="section"><a href="concepts/concepts.html#N10043">The Problem</a></span></li><li><span class="section"><a href="concepts/concepts.html#N10069">The Solution</a></span></li><li><span class="section"><a href="concepts/concepts.html#N10090">Queries</a></span><ul><li><span class="section"><a href="concepts/concepts.html#N1009E">xsl:for-each</a></span></li><li><span class="section"><a href="concepts/concepts.html#N100AA">xsl:if</a></span></li><li><span class="section"><a href="concepts/concepts.html#N100B4">xsl:choose</a></span></li></ul></li><li><span class="section"><a href="concepts/concepts.html#N100BE">Conclusion</a></span></li></ul></li><li><span class="section"><a href="concepts/resources.html">Resources</a></span></li></ul></li><li><span class="chapter"><a href="editor/xsleditor.html">XSL Editing</a></span><ul><li><span class="section"><a href="editor/xsleditor.html#Validation">Validation</a></span></li><li><span class="section"><a href="editor/xsleditor_contentassist.html">Content Assist</a></span><ul><li><span class="section"><a href="editor/xsleditor_contentassist.html#ed_XSLProposals">XSLT Element Proposals</a></span></li><li><span class="section"><a href="editor/xsleditor_contentassist_selecttest.html">Select, Test, and Match Attributes</a></span></li><li><span class="section"><a href="editor/xsleditor_contentassist_exclude.html">Exclude-Result-Prefixes</a></span></li><li><span class="section"><a href="editor/xsleditor_contentassist_modeassist.html">Mode attribute assistance</a></span></li><li><span class="section"><a href="editor/xsleditor_contentassist_namedtemplate.html">Named Template Assistance</a></span></li><li><span class="section"><a href="editor/xsleditor_contentassist_calltemplate.html">Call-Template Assistance</a></span></li><li><span class="section"><a href="editor/xsleditor_contentassist_include.html">
-                Include and Import
-                href
-                Assistance
-            </a></span></li></ul></li><li><span class="section"><a href="editor/xsleditor_templates.html">Templates</a></span><ul><li><span class="section"><a href="editor/xsleditor_templates.html#N101E2">XPath Templates</a></span></li></ul></li><li><span class="section"><a href="editor/xsleditor_coloring.html">XSLT Syntax Coloring</a></span></li><li><span class="section"><a href="editor/xsleditor_markers.html">XSLT Markers and Annotations</a></span><ul><li><span class="section"><a href="editor/xsleditor_markers.html#xsltOverRide">Template Override</a></span></li></ul></li><li><span class="section"><a href="editor/xsleditor_debugging.html">XSL Debugging</a></span></li><li><span class="section"><a href="editor/xsleditor_debugging.html">Navigation</a></span></li></ul></li><li><span class="chapter"><a href="launching/launching.html">XSL Launching and Debugging</a></span><ul><li><span class="section"><a href="launching/launching.html#XSLLaunch">XSL Launching</a></span><ul><li><span class="section"><a href="launching/launching.html#XSLLaunchConfig">Launch Configuration</a></span><ul><li><span class="section"><a href="launching/launching.html#XSLLaunch_Main">Main Tab</a></span></li><li><span class="section"><a href="launching/launching.html#XSLLaunch_Output">Output Tab</a></span></li><li><span class="section"><a href="launching/launching.html#XSLLaunch_Processor">Processor Tab</a></span></li></ul></li></ul></li><li><span class="section"><a href="launching/debugging.html">XSLT Debugging</a></span><ul><li><span class="section"><a href="launching/debugging.html#DebugGettingStarted">Starting a Debug Session</a></span></li><li><span class="section"><a href="launching/debugging_common.html">Common Debugging Operations</a></span><ul><li><span class="section"><a href="launching/debugging_common.html#XSLDebugResultView">Result View</a></span></li><li><span class="section"><a href="launching/debugging_variablesview.html">Variables View</a></span></li></ul></li><li><span class="section"><a href="launching/debugging_processors.html">XSLT Processor Specific Support</a></span><ul><li><span class="section"><a href="launching/debugging_processors.html#XSLDebugXalan">XSL Debugging with Xalan</a></span></li></ul></li></ul></li></ul></li><li><span class="chapter"><a href="preferences/xslpreferences.html">XSL Tools Preferences</a></span><ul><li><span class="section"><a href="preferences/xslpreferences.html#XSLFeatures">Features</a></span></li><li><span class="section"><a href="preferences/xslprocessors.html">Installed Processors</a></span></li><li><span class="section"><a href="preferences/xsloutputproperties.html">Output Properties</a></span></li><li><span class="section"><a href="preferences/xpathtemplates.html">XPath Templates</a></span><ul><li><span class="section"><a href="preferences/xpathtemplates.html#XPathTemplateNew">Creating New Templates</a></span></li><li><span class="section"><a href="preferences/xpathimport.html">Import XPath Templates</a></span></li><li><span class="section"><a href="preferences/xpathexport.html">Import XPath Templates</a></span></li></ul></li><li><span class="section"><a href="preferences/validation.html">Project Validation Preferences</a></span></li><li><span class="section"><a href="preferences/syntaxColoring.html">XSLT Syntax Coloring</a></span></li></ul></li><li><span class="chapter"><a href="general/general.html">General</a></span><ul><li><span class="section"><a href="general/general.html#XInclude">XInclude</a></span></li></ul></li><li><span class="chapter"><a href="samples/samples.html">XSL Tooling Samples</a></span><ul><li><span class="section"><a href="samples/samples.html#EclipseHelp">Eclipse Help</a></span><ul><li><span class="section"><a href="samples/samples.html#DocbookEclipseHelp">Creating Eclipse Help with Docbook and XSL Tools</a></span></li><li><span class="section"><a href="samples/samples.html#DITAEclipseHelp">Creating Eclipse Help with DITA and XSL Tools</a></span></li></ul></li></ul></li><li><span class="chapter"><a href="legal.html">Notices</a></span></li></ul></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 d9fa038..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/introduction/gettingstarted.html
+++ /dev/null
@@ -1,6 +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>  
-      XSLT stands for the eXtensible Stylesheet Language Transformations. It is
-      part of the XSL specification which includes the transformation and formatting objects
-      (XSL-FO).   XSL Tools primarily deals with the editing, launching, and debugging
-      of XSL Style sheets.
-   </p><div class="itemizedlist"><p class="title"><b>Getting Started</b></p><ul type="disc"><li><p><a class="ulink" href="../concepts/concepts.html" target="_top">Rescuing XSLT From Niche Status</a> - gives a basic introduction to XSLT from the point of view of creating HTML output.</p></li><li><p><a class="ulink" href="http://www.mulberrytech.com/quickref/" target="_top">XSLT and XPath Quick Reference Cards</a> - a set of PDF files that can be printed to provide quick references to the XSLT and XPath commands.</p></li></ul></div></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 df2cbcd..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/launching/debugging.html
+++ /dev/null
@@ -1,21 +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="debugging_common.html" title="Common Debugging Operations"></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. The XSL Tools
-			debugger leverages the existing eclipse platform Debug View</p><div class="figure"><a name="fig_XSLDebug"></a><p class="title"><b>Figure&nbsp;15.&nbsp;XSLT Debugging</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/launching/XSLDebugging.png" align="middle" alt="XSLT Debugging"></div></div></div><br class="figure-break"><p>
-			How the debugger acts will depend on the processor being used. Not
-			all XSLT processors pass the same type of information to the
-			debugger. These differences will be noted in the
-			<a class="xref" href="debugging_processors.html" title="XSLT Processor Specific Support">the section called &ldquo;XSLT Processor Specific Support&rdquo;</a>
-			section.
-		</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="DebugGettingStarted"></a>Starting a Debug Session</h3></div></div></div><p> Debugging is started the same way as launching an XSL
-				Tranformation is done. Except that the debug configuration is used
-				instead of the normal launch configuration. If a debugging session
-				is started on a processor that does not support debugging, a dialog
-				will ask if you want to switch to one of the supported debuggers.
-			</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Default JRE</h3><p> The default JRE does not have built in support for debugging,
-					even though it is based on Apache Xalan. It is recommended to use
-					Xalan or another processor provided by an adopter to do your
-					transformations. The default processor is known to have some issues
-					that Xalan and other processors do not have.</p></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/launching/debugging_common.html b/docs/org.eclipse.wst.xsl.doc/html/launching/debugging_common.html
deleted file mode 100644
index 3414c40..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/launching/debugging_common.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Common Debugging Operations</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="debugging.html" title="XSLT Debugging"><link rel="prev" href="debugging.html" title="XSLT Debugging"><link rel="next" href="debugging_variablesview.html" title="Variables View"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="XSLDebugCommon"></a>Common Debugging Operations</h3></div></div></div><p>
-				XSLT debugging is handled by the eclipse platforms debugging
-				framework support as outlined in the
-				<a class="ulink" href="/help/topic/org.eclipse.platform.doc.isv/guide/debug_debug.htm" target="_top">"Program Debug and Launch Support"</a>
-				. Common operations like stepping into (F5), stepping over (F6),
-				pausing, running to a breakpoint, and relaunching are supported. In
-				addition to the standard Variable and Breakpoint views provided by
-				the platform, there are some XSLT specific views and functionality
-				as well. All of these are common regardless of the particular XSLT
-				debugger being used.
-			</p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Introduction to Eclipse Debugging</h3><p>
-					<a class="ulink" href="http://www.mcs.vuw.ac.nz/courses/COMP205/2007T1/tools/eclipse/debugging/basics.shtml" target="_top">Basic Debugging in Eclipse</a>
-					contains a good general introduction to the basic features provided
-					by the Eclipse Debug view. XSL Tools leverages many of these
-					features and the same concepts apply to the XSL Tools debugger.
-				</p></div><p> In addition to the standard features and functionality, the
-				XSL Tools debugging support adds the following additional items:
-			</p><div class="itemizedlist"><ul type="disc"><li><p> Result View</p></li><li><p>XSLT specific Variables</p></li><li><p>XSLT Processor Specific Functionality</p></li></ul></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="XSLDebugResultView"></a>Result View</h4></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><p> The result view is updated throughout the debugging process,
-					and is useful to help see what output is generated at specific
-					points during a transformation.</p></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/launching/debugging_processors.html b/docs/org.eclipse.wst.xsl.doc/html/launching/debugging_processors.html
deleted file mode 100644
index 10b1922..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/launching/debugging_processors.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>XSLT Processor Specific Support</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="debugging.html" title="XSLT Debugging"><link rel="prev" href="debugging_variablesview.html" title="Variables View"><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><h3 class="title"><a name="XSLDebugProcessorSpecific"></a>XSLT Processor Specific Support</h3></div></div></div><p> Various XSLT processors provide various levels of debugging
-				support. Many do not provide support for debugging of stylesheets,
-				and thus can't be used for debugging. XSL Tools provides basic
-				support for Xalan, and can be used as a guide for adopters on how to
-				implement their own specific debugging support for other processors.
-			</p><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="XSLDebugXalan"></a>XSL Debugging with Xalan</h4></div></div></div><p> Xalan provides general stylesheet execution and evalation
-					functionality. However there are a few things that Xalan does not
-					suppor that other processors do.</p><div class="orderedlist"><p class="title"><b>Xalan Debugging Issues</b></p><ol type="1"><li><p>
-							<span class="emphasis"><em>Breakpoints</em></span>
-							- Xalan does not support stopping at Global Variables or
-							Parameters when a debugging session is started. It will
-							automatically start at the first template. Break points must be
-							placed in templates to be honored. The reason for this is that
-							Xalan lazily initializes the variables only when they are first
-							used.
-						</p></li><li><p>
-							<span class="emphasis"><em>XSLT Text elements</em></span>
-							- Xalan does not send notifications of xsl:text elements. These
-							are skipped over when debugging.
-						</p></li><li><p>
-							<span class="emphasis"><em>Built In Templates</em></span>
-							- Xalan does provide notification when the built in templates are
-							called, but currently the debugger does not support or display
-							stepping into these templates.
-						</p></li></ol></div></div></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/launching/debugging_variablesview.html b/docs/org.eclipse.wst.xsl.doc/html/launching/debugging_variablesview.html
deleted file mode 100644
index 848f6e3..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/launching/debugging_variablesview.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Variables View</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="debugging_common.html" title="Common Debugging Operations"><link rel="prev" href="debugging_common.html" title="Common Debugging Operations"><link rel="next" href="debugging_processors.html" title="XSLT Processor Specific Support"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="XSLDebugVariables"></a>Variables View</h4></div></div></div><p> The variables view will show all the local and global
-					variables and params that are currently in scope. There are two
-					types of variables that can be views.</p><div class="mediaobject" align="center"><img src="../images/launching/nodesetVariable.png" align="middle"></div><div class="itemizedlist"><p class="title"><b>Variable Types</b></p><ul type="disc"><li><p>
-							<span class="emphasis"><em>String</em></span>
-							- These contain text values. This could be strings of text,
-							numbers, or other characters.
-						</p></li><li><p>
-							<span class="emphasis"><em>Nodesets</em></span>
-							- Nodesets are represented in the variables view as expandable
-							variables. They contain sequences of nodes. The type of nodes are
-							represented by icons for elements, attributes, text, comments or
-							processing instructions.
-						</p></li></ul></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Can I change the value of variables?</h3><p> Currently the XSLT Debugger does not support changing the
-						values or contents of a variable. All XSLT variables are read
-						only.</p></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 dbdb72f..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/launching/launching.html
+++ /dev/null
@@ -1,52 +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="N1024A"></a>XSL Launching and Debugging</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><ul><li><span class="section"><a href="launching.html#XSLLaunch">XSL Launching</a></span><ul><li><span class="section"><a href="launching.html#XSLLaunchConfig">Launch Configuration</a></span><ul><li><span class="section"><a href="launching.html#XSLLaunch_Main">Main Tab</a></span></li><li><span class="section"><a href="launching.html#XSLLaunch_Output">Output Tab</a></span></li><li><span class="section"><a href="launching.html#XSLLaunch_Processor">Processor Tab</a></span></li></ul></li></ul></li><li><span class="section"><a href="debugging.html">XSLT Debugging</a></span><ul><li><span class="section"><a href="debugging.html#DebugGettingStarted">Starting a Debug Session</a></span></li><li><span class="section"><a href="debugging_common.html">Common Debugging Operations</a></span><ul><li><span class="section"><a href="debugging_common.html#XSLDebugResultView">Result View</a></span></li><li><span class="section"><a href="debugging_variablesview.html">Variables View</a></span></li></ul></li><li><span class="section"><a href="debugging_processors.html">XSLT Processor Specific Support</a></span><ul><li><span class="section"><a href="debugging_processors.html#XSLDebugXalan">XSL Debugging with Xalan</a></span></li></ul></li></ul></li></ul></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="figure"><a name="fig_XSLRun"></a><p class="title"><b>Figure&nbsp;11.&nbsp;XSLT Run/Debug</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/launching/launchShortct.png" align="middle" alt="XSLT Run/Debug"></div></div></div><br class="figure-break"><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Selecting only the XSL Stylesheet</h3><p>
-				If only the XSL Stylesheet is selected then a dialog box will prompt you for the input file to use.
-			</p></div><p>
-			Launch can also be done through the Launch Configurations pages that are used for both debugging and normal transformations.
-			These configurations can be accessed through <span class="emphasis"><em>Run-&gt;Run Configurations</em></span> menu bar option.
-		</p><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="XSLLaunchConfig"></a>Launch Configuration</h3></div></div></div><p>
-				Currently, XSL Tools only supports the launching of java based
-				processors through the Run and Debug framework. To this point, it
-				leverages and extends some of the support provided by the Java
-				launch configurations. XSL Tools does add it's own specific features
-				for launching.
-			</p><div class="figure"><a name="fig_XSLLaunchConfig"></a><p class="title"><b>Figure&nbsp;12.&nbsp;Java XSLT Launch Configuration</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/launching/XSLRunDebugConfigurations.png" align="middle" alt="Java XSLT Launch Configuration"></div></div></div><br class="figure-break"><p>
-				The tabs Main, Output, and Processor control specifics for the XSLT processor and files to be run through
-				the transformation.
-			</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">XSLT Extensions</h3><p>If the transformation needs or makes use of extension
-					functions then those jar files should be added to the Classpath tab
-					so that they are picked up during the transformation. Otherwise the
-					transformation will fail.</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="XSLLaunch_Main"></a>Main Tab</h4></div></div></div><p>
-					As shown in <a class="xref" href="launching.html#fig_XSLLaunchConfig" title="Figure&nbsp;12.&nbsp;Java XSLT Launch Configuration">Figure&nbsp;12, &ldquo;Java XSLT Launch Configuration&rdquo;</a>, the Main Tab is where the input XML file is specified.  If a particular
-					XML file is not shown in the available list when browsing the Workspace, make sure that it is added to under the XML Content
-					Type in the General preference page.  Standard eclipse launching variables can be used to specify the location of the input file.
-				</p><p>
-					A run configuration can also use a simple pipeline transformation.  Meaning that the output from one stylesheet is used as input
-					to the next stylesheet.   The Stylesheet input box can have one to many stylesheets specified.  At least one stylesheet is required
-					for a transformation.
-				</p><p>
-					The last optional item are parameters.   Stylesheets can have parameters passed into them to setup configuration information.  An
-					example would be the numerous parameters that can be set for a DocBook stylesheet transformation.   If the parameters are not
-					specified the defaults that are defined in the stylesheet will take precedence. 
-				</p></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="XSLLaunch_Output"></a>Output Tab</h4></div></div></div><p>
-					The Output Tab allows the specification of where the transformation should store the information.
-					This can be relative to the workspace or a physical location outside the workspace.
-				</p><div class="figure"><a name="fig_XSLOutputTab"></a><p class="title"><b>Figure&nbsp;13.&nbsp;Java XSLT Launch Configuration</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/launching/XSLOutputTab.png" align="middle" alt="Java XSLT Launch Configuration"></div></div></div><br class="figure-break"></div><div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title"><a name="XSLLaunch_Processor"></a>Processor Tab</h4></div></div></div><p>
-					The particular XSLT processor that will be used can be choosen from this tab. The
-					default is to use the system default processor or what ever processor you have
-					set as the default processor in the preference pages.
-				</p><div class="figure"><a name="fig_XSLProcessorTab"></a><p class="title"><b>Figure&nbsp;14.&nbsp;Java XSLT Launch Configuration</b></p><div class="figure-contents"><div class="mediaobject" align="center"><img src="../images/launching/XSLProcessorTab.png" align="middle" alt="Java XSLT Launch Configuration"></div></div></div><br class="figure-break"><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">XSLT Debugging</h3><p>
-						If you are setting up a launch configuration for debugging, do not choose
-						the JRE Default processor, you should choose either Xalan or another adopters
-						processor that supports debugging.
-					</p></div><p>
-					In addition, every processor has their own configuration options that can be specified.
-					This controls such items as indentation, handling of white space, etc.  Refer to your
-					processors documentation for the specific options available.
-				</p></div></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 4b3e8af..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="N1046F"></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 2d937aa..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 be
-            <span class="bold"><strong>bold</strong></span>.
-        </p><div class="figure"><a name="fig_XSLSyntaxColoringPreference"></a><p class="title"><b>Figure&nbsp;18.&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 e12a5ee..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="xpathexport.html" title="Import 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;17.&nbsp;Project Level Validation Preferences">Figure&nbsp;17, &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;17.&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/xpathexport.html b/docs/org.eclipse.wst.xsl.doc/html/preferences/xpathexport.html
deleted file mode 100644
index d027e00..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/xpathexport.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Import 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="xpathtemplates.html" title="XPath Templates"><link rel="prev" href="xpathimport.html" title="Import XPath Templates"><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><h3 class="title"><a name="XPathExport"></a>Import XPath Templates</h3></div></div></div><p> Add documentation about importing new templates.</p></div></body></html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsl.doc/html/preferences/xpathimport.html b/docs/org.eclipse.wst.xsl.doc/html/preferences/xpathimport.html
deleted file mode 100644
index 1becb66..0000000
--- a/docs/org.eclipse.wst.xsl.doc/html/preferences/xpathimport.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><head><META http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Import 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="xpathtemplates.html" title="XPath Templates"><link rel="prev" href="xpathtemplates.html" title="XPath Templates"><link rel="next" href="xpathexport.html" title="Import XPath Templates"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><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></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 e5a2e69..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="xpathimport.html" title="Import 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="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></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 17a26d5..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_processors.html" title="XSLT Processor Specific Support"><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><ul><li><span class="section"><a href="xslpreferences.html#XSLFeatures">Features</a></span></li><li><span class="section"><a href="xslprocessors.html">Installed Processors</a></span></li><li><span class="section"><a href="xsloutputproperties.html">Output Properties</a></span></li><li><span class="section"><a href="xpathtemplates.html">XPath Templates</a></span><ul><li><span class="section"><a href="xpathtemplates.html#XPathTemplateNew">Creating New Templates</a></span></li><li><span class="section"><a href="xpathimport.html">Import XPath Templates</a></span></li><li><span class="section"><a href="xpathexport.html">Import XPath Templates</a></span></li></ul></li><li><span class="section"><a href="validation.html">Project Validation Preferences</a></span></li><li><span class="section"><a href="syntaxColoring.html">XSLT Syntax Coloring</a></span></li></ul></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;16.&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 f684bd6..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="N10450"></a>XSL Tooling Samples</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><ul><li><span class="section"><a href="samples.html#EclipseHelp">Eclipse Help</a></span><ul><li><span class="section"><a href="samples.html#DocbookEclipseHelp">Creating Eclipse Help with Docbook and XSL Tools</a></span></li><li><span class="section"><a href="samples.html#DITAEclipseHelp">Creating Eclipse Help with DITA and XSL Tools</a></span></li></ul></li></ul></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 b4d5b96..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#N10043" label="The Problem"></topic><topic href="html/concepts/concepts.html#N10069" label="The Solution"></topic><topic href="html/concepts/concepts.html#N10090" label="Queries"><topic href="html/concepts/concepts.html#N1009E" label="xsl:for-each"></topic><topic href="html/concepts/concepts.html#N100AA" label="xsl:if"></topic><topic href="html/concepts/concepts.html#N100B4" label="xsl:choose"></topic></topic><topic href="html/concepts/concepts.html#N100BE" 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_selecttest.html" label="Select, Test, and Match Attributes"></topic><topic href="html/editor/xsleditor_contentassist_exclude.html" label="Exclude-Result-Prefixes"></topic><topic href="html/editor/xsleditor_contentassist_modeassist.html" label="Mode attribute assistance"></topic><topic href="html/editor/xsleditor_contentassist_namedtemplate.html" label="Named Template Assistance"></topic><topic href="html/editor/xsleditor_contentassist_calltemplate.html" label="Call-Template Assistance"></topic><topic href="html/editor/xsleditor_contentassist_include.html" label="Include and Import href Assistance"></topic></topic><topic href="html/editor/xsleditor_templates.html" label="Templates"><topic href="html/editor/xsleditor_templates.html#N101E2" 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 href="html/launching/launching.html#XSLLaunchConfig" label="Launch Configuration"><topic href="html/launching/launching.html#XSLLaunch_Main" label="Main Tab"></topic><topic href="html/launching/launching.html#XSLLaunch_Output" label="Output Tab"></topic><topic href="html/launching/launching.html#XSLLaunch_Processor" label="Processor Tab"></topic></topic></topic><topic href="html/launching/debugging.html" label="XSLT Debugging"><topic href="html/launching/debugging.html#DebugGettingStarted" label="Starting a Debug Session"></topic><topic href="html/launching/debugging_common.html" label="Common Debugging Operations"><topic href="html/launching/debugging_common.html#XSLDebugResultView" label="Result View"></topic><topic href="html/launching/debugging_variablesview.html" label="Variables View"></topic></topic><topic href="html/launching/debugging_processors.html" label="XSLT Processor Specific Support"><topic href="html/launching/debugging_processors.html#XSLDebugXalan" label="XSL Debugging with Xalan"></topic></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/xpathimport.html" label="Import XPath Templates"></topic><topic href="html/preferences/xpathexport.html" 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