This commit was manufactured by cvs2svn to create tag 'v200902161013'.
diff --git a/features/org.eclipse.wst.xsl_tests.feature/.project b/features/org.eclipse.wst.xsl_tests.feature/.project
deleted file mode 100644
index ba12d45..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl_tests.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xsl_tests.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.wst.xsl_tests.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 3750df1..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Dec 16 16:57:57 EST 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/features/org.eclipse.wst.xsl_tests.feature/.settings/org.eclipse.pde.prefs b/features/org.eclipse.wst.xsl_tests.feature/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fdd8568..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Fri Jan 04 09:04:43 EST 2008
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.missing-bundle-classpath-entries=0
-compilers.p.missing-packages=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=1
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/features/org.eclipse.wst.xsl_tests.feature/build.properties b/features/org.eclipse.wst.xsl_tests.feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.wst.xsl_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xsl_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xsl_tests.feature/epl-v10.html b/features/org.eclipse.wst.xsl_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xsl_tests.feature/feature.properties b/features/org.eclipse.wst.xsl_tests.feature/feature.properties
deleted file mode 100644
index 3ce3998..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/feature.properties
+++ /dev/null
@@ -1,148 +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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=XSL Tests Feature (Incubating)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=XSL Test Feature
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2008 Doug Satchwell (Chase Technology Ltd),\n\
-David Carver (Standards for Technology in Automotive Retail) and others 2008.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    Doug Satchwell (Chase Technology Ltd - http://www.chasetechnology.co.uk)\n\
-    David Carver (Standards for Technology in Automotive Retail - http://www.starstandard.org)\n\
-    Jesper Moller (NineConsult - http://www.nineconsult.dk)\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xsl_tests.feature/feature.xml b/features/org.eclipse.wst.xsl_tests.feature/feature.xml
deleted file mode 100644
index 2ba1273..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/feature.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xsl_tests.feature"
-      label="%featureName"
-      version="1.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-      <discovery label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.wst.xsl.launching.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xsl.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.xpath.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.xpath2.processor.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xsl_tests.feature/license.html b/features/org.eclipse.wst.xsl_tests.feature/license.html
deleted file mode 100644
index 303e665..0000000
--- a/features/org.eclipse.wst.xsl_tests.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-  
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-  
-  <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/tests/org.eclipse.wst.xsl.core.tests/.classpath b/tests/org.eclipse.wst.xsl.core.tests/.classpath
deleted file mode 100644
index bf37251..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xsl.core.tests/.project b/tests/org.eclipse.wst.xsl.core.tests/.project
deleted file mode 100644
index cd1a756..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.core.tests</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/tests/org.eclipse.wst.xsl.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xsl.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 3e6ccbe..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Apr 11 09:57:20 BST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.wst.xsl.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsl.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index c4fbda9..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xsl.core.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.xsl.core.tests.XSLCoreTestsPlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xsl.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
- org.apache.xalan;bundle-version="[2.7.1,2.8.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: junit.framework,
- org.eclipse.wst.xml.core.internal.validation.core
-Export-Package: org.eclipse.wst.xsl.core.tests;uses:="org.osgi.framework,junit.framework,org.eclipse.core.runtime",
- org.eclipse.wst.xsl.internal.core.tests;x-internal:=true
-Bundle-Localization: plugin
diff --git a/tests/org.eclipse.wst.xsl.core.tests/about.html b/tests/org.eclipse.wst.xsl.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/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/tests/org.eclipse.wst.xsl.core.tests/build.properties b/tests/org.eclipse.wst.xsl.core.tests/build.properties
deleted file mode 100644
index cc9a00a..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               projectfiles/,\
-               bin/,\
-               about.html,\
-               plugin.properties
diff --git a/tests/org.eclipse.wst.xsl.core.tests/plugin.properties b/tests/org.eclipse.wst.xsl.core.tests/plugin.properties
deleted file mode 100644
index b801a96..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.core.tests
-pluginName = XSL Core Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/XSLT20Test.xsl b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/XSLT20Test.xsl
deleted file mode 100644
index 0661940..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/XSLT20Test.xsl
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:template match="/">
-		<!-- TODO: Auto-generated template -->
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/circularref.xsl b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/circularref.xsl
deleted file mode 100644
index af5305f..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/circularref.xsl
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    
-    <xsl:include href="ref1.xsl"/>
-    
-	<xsl:template match="/">
-		<!-- TODO: Auto-generated template -->
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/globalVariablesTest.xsl b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/globalVariablesTest.xsl
deleted file mode 100644
index 3ca1ee2..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/globalVariablesTest.xsl
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     David Carver - STAR - bug 243578 - initial API and implementation
- *******************************************************************************  -->
-<xsl:stylesheet version="1.0"
-   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-   xmlns:xhtml="http://www.w3c.org/1999/xhtml"
-   exclude-result-prefixes="xhtml">
-   
-   <xsl:variable name="globalVariable">
-      This is a global variable
-   </xsl:variable>
-   When xsl:i
-   <xsl:param name="selectParam" select="'1'"/>
-   <xsl:param name="contentParam">Test</xsl:param>
-
-   <xsl:template name="func1">
-      <xsl:param name="p1" select="1"/>
-      <xsl:param name="p2"/>
-      <literal>Hello World</literal>
-   </xsl:template>
-   
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/lib1.xsl b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/lib1.xsl
deleted file mode 100644
index f393e6d..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/lib1.xsl
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************
- * 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
- *******************************************************************************  -->
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	
-	<xsl:template name="existsInlib1Only">
-		<xsl:param name="p1"></xsl:param>
-		<literal>Hello World</literal>
-	</xsl:template>
-	
-	<xsl:template name="existsInStyle1AndLib1">
-		<xsl:param name="p1"></xsl:param>
-		<literal>Hello World</literal>
-	</xsl:template>
-	
-	<xsl:template name="existsInLib2">
-		<xsl:param name="p1"></xsl:param>
-		<literal>Hello World</literal>
-	</xsl:template>
-	
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/lib2.xsl b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/lib2.xsl
deleted file mode 100644
index b391214..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/lib2.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************
- * 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
- *******************************************************************************  -->
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:template name="func1">
-		<xsl:param name="p1" select="1"/>
-		<xsl:param name="p2"/>
-		<literal>Hello World</literal>
-	</xsl:template>
-	
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/modeTest.xsl b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/modeTest.xsl
deleted file mode 100644
index 30930f0..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/modeTest.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:include href="modeTest2.xsl"/>
-	<xsl:template match="/">
-   
-	</xsl:template>
-    <xsl:template match="something" mode="mode1">
-    
-    </xsl:template>
-    <xsl:template match="something" mode="mode2">
-    
-    
-    </xsl:template>
-    <xsl:template name="something" mode="mode1">
-    
-    </xsl:template>
-    
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/modeTest2.xsl b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/modeTest2.xsl
deleted file mode 100644
index 3458e49..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/modeTest2.xsl
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:template match="/" mode="mode3">
-		<!-- TODO: Auto-generated template -->
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/ref1.xsl b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/ref1.xsl
deleted file mode 100644
index d6f2be1..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/ref1.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:include href="circularref.xsl"/>
-	<xsl:template match="/">
-		<!-- TODO: Auto-generated template -->
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/style1.xsl b/tests/org.eclipse.wst.xsl.core.tests/projectfiles/style1.xsl
deleted file mode 100644
index d9522dd..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/projectfiles/style1.xsl
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************
- * 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
- *******************************************************************************  -->
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	
-	<xsl:import href="lib2.xsl" />
-	<xsl:include href="lib1.xsl" />
-	
-	<xsl:template name="existsInStyle1Only">
-		<xsl:param name="p1"></xsl:param>
-		<literal>Hello World</literal>
-	</xsl:template>
-
-	<xsl:template name="existsInStyle1AndLib1"> <!-- ERROR: template existsInStyle1AndLib1 is included from lib1.xsl-->
-		<xsl:param name="p1"></xsl:param>
-		<literal>Hello World</literal>
-	</xsl:template>
-	
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/tests/XSLCoreTestSuite.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/tests/XSLCoreTestSuite.java
deleted file mode 100644
index d73ff87..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/tests/XSLCoreTestSuite.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.tests;
-
-
-import org.eclipse.wst.xsl.internal.core.tests.TestIncludedTemplates;
-import org.eclipse.wst.xsl.internal.core.tests.TestXSLCore;
-import org.eclipse.wst.xsl.internal.model.tests.TestStylesheet;
-import org.eclipse.wst.xsl.internal.model.tests.TestStylesheetModel;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-public class XSLCoreTestSuite extends TestSuite {
-	public static Test suite() {
-		return new XSLCoreTestSuite();
-	}
-
-	public XSLCoreTestSuite() {
-		super("XSL Core Test Suite");
-		addTestSuite(TestIncludedTemplates.class);
-		addTestSuite(TestXSLCore.class);
-		addTestSuite(TestStylesheet.class);
-		addTestSuite(TestStylesheetModel.class);
-	}
-}
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/tests/XSLCoreTestsPlugin.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/tests/XSLCoreTestsPlugin.java
deleted file mode 100644
index 0e14f35..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/core/tests/XSLCoreTestsPlugin.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class XSLCoreTestsPlugin extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.xsl.core.tests";
-
-	// The shared instance
-	private static XSLCoreTestsPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public XSLCoreTestsPlugin() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static XSLCoreTestsPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/AbstractValidationTest.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/AbstractValidationTest.java
deleted file mode 100644
index e3b2a36..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/AbstractValidationTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.internal.core.tests;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import junit.framework.TestCase;
-
-import org.apache.xpath.jaxp.XPathFactoryImpl;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.validation.XSLValidationMessage;
-import org.eclipse.wst.xsl.core.internal.validation.XSLValidationReport;
-import org.eclipse.wst.xsl.core.internal.validation.XSLValidator;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.eclipse.wst.xsl.core.tests.XSLCoreTestsPlugin;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * An abstract class to help with the testing. 
- * It reads an XSL file, runs the validation on it, and then parses the document looking for comment nodes where the comment starts with ERROR or WARN. 
- * For each comment node found, it determines whether the validation found a corresponding error or warning at the given comment node parent's line number. 
- * It also checks to make sure that no unexpected errors/warnings are found (ones that don't have comment nodes).
- * 
- * @author Doug Satchwell
- */
-public abstract class AbstractValidationTest extends TestCase
-{
-	protected static IProject fTestProject;
-	private static boolean fTestProjectInitialized;
-	private static final String TEST_PROJECT_NAME = "testproject";
-
-	@Override
-	protected void setUp() throws Exception
-	{
-		super.setUp();
-		if (!fTestProjectInitialized)
-		{
-			getAndCreateProject();
-
-			// URL installLocation = Platform.getBundle(XSLCoreTestsPlugin.PLUGIN_ID).getEntry("/");
-			Enumeration<String> e = Platform.getBundle(XSLCoreTestsPlugin.PLUGIN_ID).getEntryPaths("/projectfiles");// (path, filePattern, recurse)("/projectfiles", null, true);
-			while (e.hasMoreElements())
-			{
-				String path = e.nextElement();
-				URL url = Platform.getBundle(XSLCoreTestsPlugin.PLUGIN_ID).getEntry(path);
-				if (!url.getFile().endsWith("/"))
-				{
-					url = FileLocator.resolve(url);
-					path = path.substring("projectfiles".length());
-					IFile destFile = fTestProject.getFile(path);
-					System.out.println(destFile.getLocation()+" --> "+url.toExternalForm());
-					destFile.createLink(url.toURI(), IResource.REPLACE, new NullProgressMonitor());
-				}
-			}
-			fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-			fTestProjectInitialized = true;
-		}
-	}
-	
-	
-	protected IFile getFile(String path)
-	{
-		return fTestProject.getFile(new Path(path));
-	}
-	
-	/**
-	 * Validate the file
-	 * 
-	 * @param file
-	 * @return
-	 * @throws CoreException
-	 * @throws XPathExpressionException
-	 * @throws IOException
-	 */
-	protected XSLValidationReport validate(IFile file) throws CoreException, XPathExpressionException, IOException
-	{
-		XSLValidationReport report = new XSLValidationReport(file.getLocationURI().toString());
-		XSLValidator.getInstance().validate(file,report,true);
-		StylesheetModel model = XSLCore.getInstance().getStylesheet(file);		
-		assertFalse("Stylesheet model is null",model == null);
-		Map<Integer,String> expectedErrors = calculateErrorsAndWarnings(file);
-		validateErrors(model,report,expectedErrors);
-		return report;
-	}
-	
-	private void validateErrors(StylesheetModel model, XSLValidationReport report, Map<Integer,String> expectedErrors)
-	{
-		expectedErrors = new HashMap<Integer, String>(expectedErrors);
-		for (ValidationMessage msg : report.getValidationMessages())
-		{
-			XSLValidationMessage error = (XSLValidationMessage)msg;
-			assertTrue("Error report must be for the current stylesheet only", error.getNode().getStylesheet() == model.getStylesheet());
-			String comment = expectedErrors.remove(error.getLineNumber());
-			assertNotNull("Unxpected error at line "+error.getLineNumber()+": "+error,comment);
-			assertFalse("Incorrect error level for error at line "+error.getLineNumber()+": "+error,comment.startsWith("ERROR") && msg.getSeverity() != ValidationMessage.SEV_HIGH);
-			assertFalse("Incorrect error level for error at line "+error.getLineNumber()+": "+error,comment.startsWith("WARN") && msg.getSeverity() == ValidationMessage.SEV_HIGH);
-		}
-		for (Map.Entry<Integer, String> entry : expectedErrors.entrySet())
-		{	
-			assertTrue("Expected error "+entry.getValue()+" at line "+entry.getKey(), false);
-		}
-	}
-	
-	private Map<Integer,String> calculateErrorsAndWarnings(IFile file) throws XPathExpressionException, IOException, CoreException
-	{
-		Map<Integer,String> expectedErrors = new HashMap<Integer,String>();
-		IStructuredModel smodel = null;
-		try
-		{
-			smodel = StructuredModelManager.getModelManager().getModelForRead(file);
-			if (smodel != null && smodel instanceof IDOMModel)
-			{
-				IDOMModel model = (IDOMModel) smodel;
-				XPathExpression xp = XPathFactory.newInstance().newXPath().compile("//comment()"); 
-				NodeList nodeSet = (NodeList)xp.evaluate(model.getDocument(), XPathConstants.NODESET);
-				for (int i=0; i<nodeSet.getLength(); i++)
-				{
-					Node commentNode = nodeSet.item(i);
-					String comment = commentNode.getNodeValue().trim();
-					if (comment.startsWith("ERROR") || comment.startsWith("WARN"))
-					{
-						IDOMNode parent = (IDOMNode)commentNode.getParentNode();
-						int line = model.getStructuredDocument().getLineOfOffset(parent.getStartOffset()) + 1;
-						expectedErrors.put(line,comment);
-					}
-				}
-			}
-		}
-		finally
-		{
-			if (smodel != null)
-				smodel.releaseFromRead();
-		}
-		return expectedErrors;
-	}
-
-	private static void getAndCreateProject() throws CoreException
-	{
-		IWorkspace workspace = getWorkspace();
-		IWorkspaceRoot root = workspace.getRoot();
-		fTestProject = root.getProject(TEST_PROJECT_NAME);
-
-		createProject(fTestProject, null, null);
-		fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-		assertTrue(fTestProject.exists());
-	}
-
-	private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException
-	{
-		if (monitor == null)
-		{
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask("creating test project", 10);
-		// create the project
-		try
-		{
-			if (!project.exists())
-			{
-				IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
-				if (Platform.getLocation().equals(locationPath))
-				{
-					locationPath = null;
-				}
-				desc.setLocation(locationPath);
-				project.create(desc, monitor);
-				monitor = null;
-			}
-			if (!project.isOpen())
-			{
-				project.open(monitor);
-				monitor = null;
-			}
-		}
-		finally
-		{
-			if (monitor != null)
-			{
-				monitor.done();
-			}
-		}
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace()
-	{
-		return ResourcesPlugin.getWorkspace();
-	}
-}
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestIncludedTemplates.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestIncludedTemplates.java
deleted file mode 100644
index ccd6542..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestIncludedTemplates.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.core.tests;
-
-public class TestIncludedTemplates extends AbstractValidationTest
-{
-	public void test1() throws Exception
-	{
-		validate(getFile("style1.xsl"));
-	}
-}
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestXSLCore.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestXSLCore.java
deleted file mode 100644
index 4857029..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/core/tests/TestXSLCore.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.wst.xsl.internal.core.tests;
-
-import junit.framework.TestCase;
-import org.eclipse.wst.xsl.core.XSLCore;
-
-public class TestXSLCore extends TestCase {
-
-	public TestXSLCore() {
-		super();
-	}
-
-	public TestXSLCore(String name) {
-		super(name);
-	}
-	
-	public void testisXSLNamespaceNullFalse() {
-		assertFalse(XSLCore.isXSLNamespace(null));
-	}
-		
-}
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/AbstractModelTest.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/AbstractModelTest.java
deleted file mode 100644
index 2a9387b..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/AbstractModelTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Chase Technology Ltd - http://www.chasetechnology.co.uk
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Doug Satchwell (Chase Technology Ltd) - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.internal.model.tests;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import junit.framework.TestCase;
-
-import org.apache.xpath.jaxp.XPathFactoryImpl;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xsl.core.XSLCore;
-import org.eclipse.wst.xsl.core.internal.validation.XSLValidationMessage;
-import org.eclipse.wst.xsl.core.internal.validation.XSLValidationReport;
-import org.eclipse.wst.xsl.core.internal.validation.XSLValidator;
-import org.eclipse.wst.xsl.core.model.StylesheetModel;
-import org.eclipse.wst.xsl.core.tests.XSLCoreTestsPlugin;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * An abstract class to help with the testing. 
- * It reads an XSL file, runs the validation on it, and then parses the document looking for comment nodes where the comment starts with ERROR or WARN. 
- * For each comment node found, it determines whether the validation found a corresponding error or warning at the given comment node parent's line number. 
- * It also checks to make sure that no unexpected errors/warnings are found (ones that don't have comment nodes).
- * 
- * @author Doug Satchwell
- */
-public abstract class AbstractModelTest extends TestCase
-{
-	protected static IProject fTestProject;
-	private static boolean fTestProjectInitialized;
-	private static final String TEST_PROJECT_NAME = "testproject";
-
-	@Override
-	protected void setUp() throws Exception
-	{
-		super.setUp();
-		if (!fTestProjectInitialized)
-		{
-			getAndCreateProject();
-
-			// URL installLocation = Platform.getBundle(XSLCoreTestsPlugin.PLUGIN_ID).getEntry("/");
-			Enumeration<String> e = Platform.getBundle(XSLCoreTestsPlugin.PLUGIN_ID).getEntryPaths("/projectfiles");// (path, filePattern, recurse)("/projectfiles", null, true);
-			while (e.hasMoreElements())
-			{
-				String path = e.nextElement();
-				URL url = Platform.getBundle(XSLCoreTestsPlugin.PLUGIN_ID).getEntry(path);
-				if (!url.getFile().endsWith("/"))
-				{
-					url = FileLocator.resolve(url);
-					path = path.substring("projectfiles".length());
-					IFile destFile = fTestProject.getFile(path);
-					System.out.println(destFile.getLocation()+" --> "+url.toExternalForm());
-					destFile.createLink(url.toURI(), IResource.REPLACE, new NullProgressMonitor());
-				}
-			}
-			fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-			fTestProjectInitialized = true;
-		}
-	}
-	
-	
-	protected IFile getFile(String path)
-	{
-		return fTestProject.getFile(new Path(path));
-	}
-	
-	/**
-	 * Validate the file
-	 * 
-	 * @param file
-	 * @return
-	 * @throws CoreException
-	 * @throws XPathExpressionException
-	 * @throws IOException
-	 */
-	protected XSLValidationReport validate(IFile file) throws CoreException, XPathExpressionException, IOException
-	{
-		XSLValidationReport report = new XSLValidationReport(file.getLocationURI().toString());
-		XSLValidator.getInstance().validate(file,report,true);
-		StylesheetModel model = XSLCore.getInstance().getStylesheet(file);		
-		assertFalse("Stylesheet model is null",model == null);
-		Map<Integer,String> expectedErrors = calculateErrorsAndWarnings(file);
-		validateErrors(model,report,expectedErrors);
-		return report;
-	}
-	
-	private void validateErrors(StylesheetModel model, XSLValidationReport report, Map<Integer,String> expectedErrors)
-	{
-		expectedErrors = new HashMap<Integer, String>(expectedErrors);
-		for (ValidationMessage msg : report.getValidationMessages())
-		{
-			XSLValidationMessage error = (XSLValidationMessage)msg;
-			assertTrue("Error report must be for the current stylesheet only", error.getNode().getStylesheet() == model.getStylesheet());
-			String comment = expectedErrors.remove(error.getLineNumber());
-			assertNotNull("Unxpected error at line "+error.getLineNumber()+": "+error,comment);
-			assertFalse("Incorrect error level for error at line "+error.getLineNumber()+": "+error,comment.startsWith("ERROR") && msg.getSeverity() != ValidationMessage.SEV_HIGH);
-			assertFalse("Incorrect error level for error at line "+error.getLineNumber()+": "+error,comment.startsWith("WARN") && msg.getSeverity() == ValidationMessage.SEV_HIGH);
-		}
-		for (Map.Entry<Integer, String> entry : expectedErrors.entrySet())
-		{	
-			assertTrue("Expected error "+entry.getValue()+" at line "+entry.getKey(), false);
-		}
-	}
-	
-	private Map<Integer,String> calculateErrorsAndWarnings(IFile file) throws XPathExpressionException, IOException, CoreException
-	{
-		Map<Integer,String> expectedErrors = new HashMap<Integer,String>();
-		IStructuredModel smodel = null;
-		try
-		{
-			smodel = StructuredModelManager.getModelManager().getModelForRead(file);
-			if (smodel != null && smodel instanceof IDOMModel)
-			{
-				IDOMModel model = (IDOMModel) smodel;
-				XPathExpression xp = XPathFactory.newInstance().newXPath().compile("//comment()"); 
-				NodeList nodeSet = (NodeList)xp.evaluate(model.getDocument(), XPathConstants.NODESET);
-				for (int i=0; i<nodeSet.getLength(); i++)
-				{
-					Node commentNode = nodeSet.item(i);
-					String comment = commentNode.getNodeValue().trim();
-					if (comment.startsWith("ERROR") || comment.startsWith("WARN"))
-					{
-						IDOMNode parent = (IDOMNode)commentNode.getParentNode();
-						int line = model.getStructuredDocument().getLineOfOffset(parent.getStartOffset()) + 1;
-						expectedErrors.put(line,comment);
-					}
-				}
-			}
-		}
-		finally
-		{
-			if (smodel != null)
-				smodel.releaseFromRead();
-		}
-		return expectedErrors;
-	}
-
-	private static void getAndCreateProject() throws CoreException
-	{
-		IWorkspace workspace = getWorkspace();
-		IWorkspaceRoot root = workspace.getRoot();
-		fTestProject = root.getProject(TEST_PROJECT_NAME);
-
-		createProject(fTestProject, null, null);
-		fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-		assertTrue(fTestProject.exists());
-	}
-
-	private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException
-	{
-		if (monitor == null)
-		{
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask("creating test project", 10);
-		// create the project
-		try
-		{
-			if (!project.exists())
-			{
-				IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
-				if (Platform.getLocation().equals(locationPath))
-				{
-					locationPath = null;
-				}
-				desc.setLocation(locationPath);
-				project.create(desc, monitor);
-				monitor = null;
-			}
-			if (!project.isOpen())
-			{
-				project.open(monitor);
-				monitor = null;
-			}
-		}
-		finally
-		{
-			if (monitor != null)
-			{
-				monitor.done();
-			}
-		}
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace()
-	{
-		return ResourcesPlugin.getWorkspace();
-	}
-}
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheet.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheet.java
deleted file mode 100644
index 5c9a119..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheet.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.eclipse.wst.xsl.internal.model.tests;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.xsl.core.internal.StylesheetBuilder;
-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.XSLAttribute;
-
-public class TestStylesheet extends AbstractModelTest {
-
-	public TestStylesheet() {
-		// TODO Auto-generated constructor stub
-	}
-	
-	public void testLoadModel() {
-		StylesheetBuilder builder = StylesheetBuilder.getInstance();
-		Stylesheet model = builder.getStylesheet(getFile("style1.xsl"), false);
-		assertNotNull("Model failed to load, returned NULL", model);
-	}
-	
-	public void testgetLocalTemplatesTemplates() {
-		StylesheetBuilder builder = StylesheetBuilder.getInstance();
-		Stylesheet model = builder.getStylesheet(getFile("style1.xsl"), false);
-		assertNotNull("Model failed to load, returned NULL", model);
-		
-		List<Template> templatesList = model.getTemplates();
-		assertEquals("Wrong number of templates returned.", 2, templatesList.size());
-	}
-	
-	public void testGetIncludes() {
-		StylesheetBuilder builder = StylesheetBuilder.getInstance();
-		Stylesheet stylesheet = builder.getStylesheet(getFile("style1.xsl"), false);
-		assertNotNull("Model failed to load, returned NULL", stylesheet);
-		
-		List<Include> includeList = stylesheet.getIncludes();
-		assertEquals("Wrong number of includes returned.", 1, includeList.size());
-	}
-	
-	public void testGetImports() {
-		StylesheetBuilder builder = StylesheetBuilder.getInstance();
-		Stylesheet stylesheet = builder.getStylesheet(getFile("style1.xsl"), false);
-		assertNotNull("Model failed to load, returned NULL", stylesheet);
-		
-		List<Import> includeList = stylesheet.getImports();
-		assertEquals("Wrong number of includes returned.", 1, includeList.size());
-		
-	}
-	
-	public void testGetGlobalVariables() {
-		StylesheetBuilder builder = StylesheetBuilder.getInstance();
-		Stylesheet stylesheet = builder.getStylesheet(getFile("globalVariablesTest.xsl"), false);
-		assertNotNull("Model failed to load, returned NULL", stylesheet);
-		
-		List<Variable> globalVariablesList = stylesheet.getGlobalVariables();
-		assertEquals("Wrong number of global variables returned.", 1, globalVariablesList.size());
-	}
-	
-	public void testGetLineNumber() {
-		StylesheetBuilder builder = StylesheetBuilder.getInstance();
-		Stylesheet stylesheet = builder.getStylesheet(getFile("globalVariablesTest.xsl"), false);
-		assertNotNull("Model failed to load, returned NULL", stylesheet);
-		// Line Number is off by 1 from what is displayed in the Editor
-		assertEquals("Incorrect line number.", 12, stylesheet.getLineNumber());
-	}
-	
-	public void testGetColumnNumber() {
-		StylesheetBuilder builder = StylesheetBuilder.getInstance();
-		Stylesheet stylesheet = builder.getStylesheet(getFile("globalVariablesTest.xsl"), false);
-		assertNotNull("Model failed to load, returned NULL", stylesheet);
-		// Line Number is off by 1 from what is displayed in the Editor
-		assertEquals("Incorrect column number.", 0, stylesheet.getColumnNumber());
-	}
-	
-	public void testGetVersion() {
-		StylesheetBuilder builder = StylesheetBuilder.getInstance();
-		Stylesheet stylesheet = builder.getStylesheet(getFile("globalVariablesTest.xsl"), false);
-		assertNotNull("Model failed to load, returned NULL", stylesheet);
-		
-		// Line Number is off by 1 from what is displayed in the Editor
-		assertEquals("Wrong version number returned.", "1.0", stylesheet.getVersion());
-	}
-	
-	public void testXSLT2GetVersion() {
-		StylesheetBuilder builder = StylesheetBuilder.getInstance();
-		Stylesheet stylesheet = builder.getStylesheet(getFile("XSLT20Test.xsl"), false);
-		assertNotNull("Model failed to load, returned NULL", stylesheet);
-		// Line Number is off by 1 from what is displayed in the Editor
-		assertEquals("Wrong version number returned.", "2.0", stylesheet.getVersion());
-	}
-	
-	public void testGetAttributes() {
-		StylesheetBuilder builder = StylesheetBuilder.getInstance();
-		Stylesheet stylesheet = builder.getStylesheet(getFile("globalVariablesTest.xsl"), false);
-		assertNotNull("Model failed to load, returned NULL", stylesheet);
-		
-		Map<String,XSLAttribute> attributeList = stylesheet.getAttributes();
-		assertEquals("Incorrect number of attributes", 4, attributeList.size());
-		XSLAttribute attribute = stylesheet.getAttribute("exclude-result-prefixes");
-		assertEquals("Wrong attribute returned:", "exclude-result-prefixes", attribute.getName());
-		
-	}
-	
-	
-	
-}
diff --git a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheetModel.java b/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheetModel.java
deleted file mode 100644
index 490f013..0000000
--- a/tests/org.eclipse.wst.xsl.core.tests/src/org/eclipse/wst/xsl/internal/model/tests/TestStylesheetModel.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.wst.xsl.internal.model.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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;
-
-public class TestStylesheetModel extends AbstractModelTest {
-
-	public TestStylesheetModel() {
-		
-	}
-	
-	public void testStyleSheetModel() {
-		
-		StylesheetModel model = XSLCore.getInstance().getStylesheet(getFile("globalVariablesTest.xsl"));
-		assertNotNull("Failed to load stylesheet 'globalVariablesTest.xsl'.", model);
-		model = XSLCore.getInstance().getStylesheet(getFile("style1.xsl"));
-		assertNotNull("Failed to load stylesheet 'style1.xsl'.", model);
-		model = XSLCore.getInstance().getStylesheet(getFile("XSLT20Test.xsl"));
-		assertNotNull("Failed to load stylesheet 'XSLT20Test.xsl'.", model);
-		model = XSLCore.getInstance().getStylesheet(getFile("circularref.xsl"));
-		assertNotNull("Failed to load stylesheet 'circularref.xsl'.", model);
-		model = XSLCore.getInstance().getStylesheet(getFile("modeTest.xsl"));
-		assertNotNull("Failed to load stylesheet 'modeTest.xsl'.", model);
-		
-	}
-	
-	public void testFindAvailableTemplateModes() {
-		ArrayList<String> modes = new ArrayList();
-		StylesheetModel model = XSLCore.getInstance().getStylesheet(getFile("modeTest.xsl"));
-		List<Template> templates = model.getTemplates();
-		assertTrue("No templates returned.", templates.size() > 0);
-		
-		for (Template template : templates) {
-			XSLAttribute attribute = template.getAttribute("mode");
-			if (attribute != null) {
-				if (modes.indexOf(attribute.getValue()) == -1 ) {
-					modes.add(attribute.getValue());
-				}
-			}
-		}
-		assertEquals("Wrong number of mode templates returned.", 3, modes.size());
-	}
-}
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/.classpath b/tests/org.eclipse.wst.xsl.launching.tests/.classpath
deleted file mode 100644
index 3100a6b..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="test-launching-src"/>
-	<classpathentry kind="src" path="xsl-test-resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/.project b/tests/org.eclipse.wst.xsl.launching.tests/.project
deleted file mode 100644
index 2b08b8e..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.launching.tests</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/tests/org.eclipse.wst.xsl.launching.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xsl.launching.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index df7824f..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Jan 03 22:24:37 EST 2008
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xsl.launching.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6fb9c3a..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Jan 04 09:08:42 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xsl.launching.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fdd8568..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Fri Jan 04 09:04:43 EST 2008
-compilers.incompatible-environment=1
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.missing-bundle-classpath-entries=0
-compilers.p.missing-packages=2
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=1
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsl.launching.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 388b4bb..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xsl.launching.tests
-Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xsl.launching;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.wst.xsl.debug.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.debug.ui;bundle-version="3.5.0",
- org.eclipse.swt;bundle-version="[3.4.0,4.0.0)"
-Bundle-Activator: org.eclipse.wst.xsl.launching.tests.Activator
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %Bundle-Vendor.0
-Export-Package: org.eclipse.wst.xsl.launching.tests,
- org.eclipse.wst.xsl.launching.tests.testcase
-
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/about.html b/tests/org.eclipse.wst.xsl.launching.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/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/tests/org.eclipse.wst.xsl.launching.tests/build.properties b/tests/org.eclipse.wst.xsl.launching.tests/build.properties
deleted file mode 100644
index fff2e88..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.. = test-launching-src/,\
-           xsl-test-resources/
-output.. = bin/
-src.includes = test-launching-src/,\
-               xsl-test-resources/,\
-               build.properties
-bin.includes = .,\
-               META-INF/,\
-               plugin.properties,\
-               about.html,\
-               xsl-test-resources/,\
-               bin/
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/plugin.properties b/tests/org.eclipse.wst.xsl.launching.tests/plugin.properties
deleted file mode 100644
index 12f3e74..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.launching.tests
-Bundle-Name.0 = XST Core Test Plug-in (Incubating)
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/Activator.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/Activator.java
deleted file mode 100644
index 4e2aa07..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/Activator.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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:
- *     Gary Karasiuk (IBM Corporation) - initial implementation
- *     Jesper Steen Møller - adapted for XSL
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.launching.tests;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	/** org.eclipse.wst.xsl.launching.tests - plug-in id */
-	public static final String PLUGIN_ID = "org.eclipse.wst.xsl.launching.tests";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-	
-	public void handleException(Exception e){
-		Status status = new Status(IStatus.ERROR, PLUGIN_ID, e.getLocalizedMessage(), e);
-		getLog().log(status);
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/LaunchingSuite.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/LaunchingSuite.java
deleted file mode 100644
index 9e0efec..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/LaunchingSuite.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.eclipse.wst.xsl.launching.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xsl.launching.tests.testcase.TestInputFileBlock;
-import org.eclipse.wst.xsl.launching.tests.testcase.XSLLaunchingTests;
-
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-/**
- * This class does specifies all the classes in this bundle
- * that provide tests. It is primarily for the convenience of 
- * the AllTestsSuite.
- *  
- */
-public class LaunchingSuite extends TestSuite {
-	public static TestSuite suite() {
-		return new LaunchingSuite();
-	}
-
-	public LaunchingSuite() {
-		super("XSL Launching Test Suite");
-		addTest(new TestSuite(XSLLaunchingTests.class));
-		addTest(new TestSuite(TestInputFileBlock.class));
-	}
-
-	public LaunchingSuite(Class theClass, String name) {
-		super(theClass, name);
-	}
-
-	public LaunchingSuite(Class theClass) {
-		super(theClass);
-	}
-
-	public LaunchingSuite(String name) {
-		super(name);
-	}
-}
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/Misc.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/Misc.java
deleted file mode 100644
index 3478c4a..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/Misc.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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:
- *     Gary Karasiuk (IBM Corporation) - initial implementation
- *     Jesper Steen Møller - adapted for XSL
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.launching.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * Some miscellaneous helper methods. 
- * @author karasiuk
- *
- */
-public class Misc {
-	
-	private static DateFormat _df = new SimpleDateFormat("HH:mm:ss.SSSS"); //$NON-NLS-1$
-	
-	public static void close(InputStream in){
-		if (in == null)return;
-		try {
-			in.close();
-		}
-		catch (IOException e){
-			// eat it
-		}
-	}
-
-	public static void close(OutputStream out) {
-		if (out == null)return;
-		try {
-			out.close();
-		}
-		catch (IOException e){
-			// eat it
-		}		
-	}
-	
-	/**
-	 * Write a line to the console for debugging.
-	 * @param line
-	 */
-	public static void log(String line){
-		System.err.println(timestampIt(line));  
-	}
-	
-	public static String timestampIt(String line){
-		Date date = new Date();
-		long thread = Thread.currentThread().getId();
-		return _df.format(date) + " " + thread + " " + line;//$NON-NLS-1$//$NON-NLS-2$
-	}
-	
-	public static void log(StringBuffer b){
-		log(b.toString());
-		b.setLength(0);
-	}
-	
-	public static void niy(String msg){
-		if (msg == null)msg = "Sorry, this function is not implemented yet"; //$NON-NLS-1$
-		throw new RuntimeException(msg);
-	}
-	
-}
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/TestEnvironment.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/TestEnvironment.java
deleted file mode 100644
index d310089..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/TestEnvironment.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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:
- *     Gary Karasiuk (IBM Corporation) - initial implementation
- *     Jesper Steen Møller - adapted for XSL
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-
-public class TestEnvironment {
-	
-	public static final boolean DEBUG = true;
-	
-	private IWorkspace	_workspace;
-	private HashMap<String, IProject> _projects = new HashMap<String, IProject>(20);
-	
-	public TestEnvironment() throws CoreException {
-		_workspace = ResourcesPlugin.getWorkspace();
-		if (DEBUG){
-			_workspace.getRoot().delete(true, true, null);
-		}
-	}
-	
-	public IPath addFolder(IPath root, String folderName) throws CoreException {
-		IPath path = root.append(folderName);
-		createFolder(path);
-		return path;
-	}
-	
-	public void incrementalBuild() throws CoreException{
-		getWorkspace().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
-	}
-	
-	public void fullBuild() throws CoreException{
-		getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
-	}
-	
-	public void waitForBuild(){
-		boolean wasInterrupted = false;
-		do {
-			try {
-				Job.getJobManager().join(ResourcesPlugin.FAMILY_MANUAL_BUILD, null);
-				wasInterrupted = false;
-			}
-			catch (InterruptedException e){
-				wasInterrupted = true;
-			}
-		} while(wasInterrupted);
-	}
-
-	private IFolder createFolder(IPath path) throws CoreException {
-		if (path.segmentCount() <= 1)return null;
-		
-		IFolder folder = _workspace.getRoot().getFolder(path);
-		if (!folder.exists()){
-			folder.create(true, true, null);
-		}
-		return folder;
-	}
-
-	public IProject createProject(String name) throws CoreException {
-		final IProject project = _workspace.getRoot().getProject(name);
-		IWorkspaceRunnable create = new IWorkspaceRunnable() {
-
-			public void run(IProgressMonitor monitor) throws CoreException {
-				project.create(monitor);
-				project.open(monitor);	
-			}		
-		};
-		
-		_workspace.run(create, null);
-		_projects.put(name, project);
-		
-		return project;
-	}
-
-	public void dispose() throws CoreException {
-		if (DEBUG)return;
-		for (Iterator<IProject> it=_projects.values().iterator(); it.hasNext();){
-			IProject project = it.next();
-			project.delete(true, null);
-		}
-	}
-
-	public IPath addFile(IPath folder, String fileName, String contents) throws CoreException, UnsupportedEncodingException {
-		IPath filePath = folder.append(fileName);
-		createFile(filePath, contents.getBytes("UTF8"));
-		return filePath;
-	}
-	
-	public IPath addFileFromResource(IPath folder, String fileName, String path) throws CoreException {
-		IPath filePath = folder.append(fileName);
-		createFileFromResource(filePath, path);
-		return filePath;
-	}
-	
-	private IFile createFile(IPath filePath, byte[] contents) throws CoreException {
-		IFile file = _workspace.getRoot().getFile(filePath);
-		ByteArrayInputStream in = new ByteArrayInputStream(contents);
-		if (file.exists())file.setContents(in, true, false, null);
-		else file.create(in, true, null);
-		return file;
-	}
-
-	private IFile createFileFromResource(IPath filePath, String path) throws CoreException {
-		IFile file = _workspace.getRoot().getFile(filePath);
-		InputStream in = TestEnvironment.class.getResourceAsStream(path);
-		if (file.exists())file.setContents(in, true, false, null);
-		else file.create(in, true, null);
-		return file;
-	}
-	public IWorkspace getWorkspace(){
-		return _workspace;
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/MockInputFileBlock.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/MockInputFileBlock.java
deleted file mode 100644
index 93d47b2..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/MockInputFileBlock.java
+++ /dev/null
@@ -1,28 +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 214228 - Verify that File Extensions available for input block
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.tests.testcase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.xsl.internal.debug.ui.tabs.main.InputFileBlock;
-
-public class MockInputFileBlock extends InputFileBlock {
-
-	public MockInputFileBlock(IFile defaultFile) {
-		super(defaultFile);
-		// TODO Auto-generated constructor stub
-	}
-	
-	public String[] getAvailableFileExtensions() {
-		// Since this is private we need to expose it for testing.
-		return getFileExtensions();
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/TestInputFileBlock.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/TestInputFileBlock.java
deleted file mode 100644
index f6e60db..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/TestInputFileBlock.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- *Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- *All rights reserved. This program and the accompanying materials
- *are made available under the terms of the Eclipse Public License v1.0
- *which accompanies this distribution, and is available at
- *http://www.eclipse.org/legal/epl-v10.html
- *
- *Contributors:
- *    David Carver - bug 214228 - Verify that File Extensions available for input block
- *******************************************************************************/
-package org.eclipse.wst.xsl.launching.tests.testcase;
-
-import junit.framework.TestCase;
-
-
-public class TestInputFileBlock extends TestCase {
-
-	
-	public void testXMLFileExtensions() throws Exception {
-		MockInputFileBlock fileBlock = new MockInputFileBlock(null);
-		String[] fileExtensions = fileBlock.getAvailableFileExtensions();
-		assertNotNull("No file extensions returned.", fileExtensions);
-		assertTrue("Did not find 'xml'", findExtension("xml", fileExtensions));
-		assertTrue("Did not find 'xsl'", findExtension("xsl", fileExtensions));
-		assertTrue("Did not find 'xslt'", findExtension("xslt", fileExtensions));
-	}
-	
-	private boolean findExtension(String extension, String[] exts) {
-		boolean foundsw = false;
-		for (int i = 0; i < exts.length; i++) {
-			if (extension.equalsIgnoreCase(exts[i])) {
-				foundsw = true;
-			}
-		}
-		return foundsw;
-	}
-	
-}
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/XSLLaunchingTests.java b/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/XSLLaunchingTests.java
deleted file mode 100644
index b99b54b..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/test-launching-src/org/eclipse/wst/xsl/launching/tests/testcase/XSLLaunchingTests.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Jesper Steen Møller
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jesper Steen Møller - initial XSL launching test
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.launching.tests.testcase;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.wst.xsl.launching.tests.TestEnvironment;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-public class XSLLaunchingTests extends TestCase {
-
-	private TestEnvironment _env;
-	private IProject _testProject;
-	private String launchXml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"
-		+ "<launchConfiguration type=\"org.eclipse.wst.xsl.launching.launchConfigurationType\">"
-		+ "<stringAttribute key=\"org.eclipse.wst.xsl.jaxp.launching.ATTR_ATTRIBUTES\" value=\"&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;Attributes/&gt;&#13;&#10;\"/>"
-		+ "<stringAttribute key=\"org.eclipse.wst.xsl.jaxp.launching.ATTR_OUTPUT_PROPERTIES\" value=\"&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;Properties/&gt;&#13;&#10;\"/>"
-		+ "<booleanAttribute key=\"org.eclipse.wst.xsl.jaxp.launching.ATTR_USE_DEFAULT_PROCESSOR\" value=\"true\"/>"
-		+ "<stringAttribute key=\"org.eclipse.wst.xsl.jaxp.launching.INVOKER_DESCRIPTOR\" value=\"org.eclipse.wst.xsl.launching.jaxp.invoke\"/>"
-		+ "<booleanAttribute key=\"org.eclipse.wst.xsl.launching.ATTR_FORMAT_FILE\" value=\"false\"/>"
-		+ "<stringAttribute key=\"org.eclipse.wst.xsl.launching.ATTR_INPUT_FILE\" value=\"${workspace_loc:/XSLTestProject/input.xml}\"/>"
-		+ "<booleanAttribute key=\"org.eclipse.wst.xsl.launching.ATTR_OPEN_FILE\" value=\"true\"/>"
-		+ "<stringAttribute key=\"org.eclipse.wst.xsl.launching.ATTR_OUTPUT_FILENAME\" value=\"output.xml\"/>"
-		+ "<stringAttribute key=\"org.eclipse.wst.xsl.launching.ATTR_PIPELINE\" value=\"&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;Pipeline&gt;&#13;&#10;&lt;OutputProperties/&gt;&#13;&#10;&lt;Transform path=&quot;/XSLTestProject/transform.xsl&quot; pathType=&quot;resource&quot;&gt;&#13;&#10;&lt;Parameters/&gt;&#13;&#10;&lt;/Transform&gt;&#13;&#10;&lt;/Pipeline&gt;&#13;&#10;\"/>"
-		+ "<booleanAttribute key=\"org.eclipse.wst.xsl.launching.ATTR_USE_DEFAULT_OUTPUT_FILE\" value=\"false\"/>"
-		+ "<stringAttribute key=\"org.eclipse.wst.xsl.launching.ATTR_OUTPUT_FOLDER\" value=\"${workspace_loc:/XSLTestProject}\"/>"
-		+ "</launchConfiguration>";
-
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		_env = new TestEnvironment();
-		_testProject = _env.createProject("XSLTestProject");
-	}
-
-	private void launchConfiguration(IPath folder, String launchXml)
-			throws CoreException, UnsupportedEncodingException,
-			InterruptedException {
-		String name = "launch" + (int) (Math.random() * 1000);
-		_env.addFile(folder, name + ".launch", launchXml);
-
-		ILaunchManager mgr = DebugPlugin.getDefault().getLaunchManager();
-		ILaunchConfiguration[] allConfigs = mgr.getLaunchConfigurations();
-		ILaunchConfiguration mine = null;
-		boolean found = false;
-		for (ILaunchConfiguration lc : allConfigs) {
-			if (lc.getName().equals(name)) {
-				found = true;
-				mine = lc;
-				assertEquals(
-						"bad launch config type?",
-						"org.eclipse.wst.xsl.launching.launchConfigurationType",
-						lc.getType().getIdentifier());
-				assertEquals("bad launch config plugin?",
-						"org.eclipse.wst.xsl.launching", lc.getType()
-								.getPluginIdentifier());
-			}
-		}
-		assertTrue("expected to find the launch config we just added", found);
-
-		ILaunch launch = mine.launch(ILaunchManager.RUN_MODE,
-				new NullProgressMonitor());
-		for (int i = 0; i < 400 && !launch.isTerminated(); ++i) {
-			System.out.println("waiting");
-			Thread.sleep(200);
-		}
-		assertTrue("Launch did not complete within a 20 second time period",
-				launch.isTerminated());
-
-		_testProject.refreshLocal(2, null);
-	}
-
-	public void testBuildConfig() throws CoreException, InterruptedException,
-			ParserConfigurationException, SAXException, IOException {
-		IPath folder = _testProject.getFullPath();
-		_env.addFileFromResource(folder, "input.xml", "1-input.xml");
-		_env.addFileFromResource(folder, "transform.xsl", "1-transform.xsl");
-
-		launchConfiguration(folder, launchXml);
-		IFile output = _testProject.getFile("output.xml");
-		Document doc = parseXml(output.getContents(true));
-
-		assertEquals("root-out", doc.getDocumentElement().getNodeName());
-	}
-
-	/**
-	 * Test to make sure comments are being copied out to the output file.
-	 * bug 253703
-	 * @throws CoreException
-	 * @throws InterruptedException
-	 * @throws ParserConfigurationException
-	 * @throws SAXException
-	 * @throws IOException
-	 */
-//	public void testTransformComments() throws CoreException, InterruptedException,
-//			ParserConfigurationException, SAXException, IOException {
-//		IPath folder = _testProject.getFullPath();
-//		_env.addFileFromResource(folder, "input.xml", "testCommentInput.xml");
-//		_env.addFileFromResource(folder, "transform.xsl", "testComments.xsl");
-//		_env.addFileFromResource(folder, "expected.xml", "testCommentsExpected.xml");
-//
-//		launchConfiguration(folder, launchXml);
-//		IFile output = _testProject.getFile("output.xml");
-//		IFile expected = _testProject.getFile("expected.xml");
-//		
-//		String result = readFile(output.getContents());
-//		String wanted = readFile(expected.getContents());
-//		
-//		assertEquals("Unexpected results:", wanted, result);
-//	}
-
-	private String readFile(InputStream input) {
-		String str;
-		String finalString = "";
-		try {
-			BufferedReader in = new BufferedReader(new InputStreamReader(input));
-			while ((str = in.readLine()) != null) {
-				finalString = finalString + str + "\n";
-			}
-			in.close();
-		} catch (IOException e) {
-		}
-		return finalString;
-	}
-
-	static private Document parseXml(InputStream contents)
-			throws ParserConfigurationException, SAXException, IOException {
-		DocumentBuilderFactory builderFactory = DocumentBuilderFactory
-				.newInstance();
-		DocumentBuilder builder = builderFactory.newDocumentBuilder();
-
-		return builder.parse(contents);
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		_env.dispose();
-		super.tearDown();
-	}
-}
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/1-input.xml b/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/1-input.xml
deleted file mode 100644
index 5757dde..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/1-input.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-	<element attribute="yes"/>
-</root>
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/1-transform.xsl b/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/1-transform.xsl
deleted file mode 100644
index 36af48c..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/1-transform.xsl
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:template match="//root">
-		<root-out/>
-	</xsl:template>
-</xsl:stylesheet>
-
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testCommentInput.out.xml b/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testCommentInput.out.xml
deleted file mode 100644
index 6351287..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testCommentInput.out.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><root><element>
-   </element><element>
-     
-   </element><element>
-   
-</element></root>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testCommentInput.xml b/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testCommentInput.xml
deleted file mode 100644
index 11abc90..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testCommentInput.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<doc>
-   <test>
-     <!--first comment-->
-   </test>
-   <!--second comment-->
-</doc>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testComments.xsl b/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testComments.xsl
deleted file mode 100644
index 91ee3d1..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testComments.xsl
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	version="1.0">
-	<xsl:template match="comment()">
-		<xsl:copy />
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testCommentsExpected.xml b/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testCommentsExpected.xml
deleted file mode 100644
index 038aaad..0000000
--- a/tests/org.eclipse.wst.xsl.launching.tests/xsl-test-resources/org/eclipse/wst/xsl/launching/tests/testCommentsExpected.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-   
-     <!--first comment-->
-   
-   <!--second comment-->
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/.classpath b/tests/org.eclipse.wst.xsl.ui.tests/.classpath
deleted file mode 100644
index c5eb0e9..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="**/internal/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/.project b/tests/org.eclipse.wst.xsl.ui.tests/.project
deleted file mode 100644
index 71775bb..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsl.ui.tests</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/tests/org.eclipse.wst.xsl.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xsl.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 99789f3..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Fri Apr 04 14:45:13 GMT-05:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xsl.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 9d946fa..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xsl.ui.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifer
-Bundle-Activator: org.eclipse.wst.xsl.ui.tests.Activator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.junit;bundle-version="3.8.2",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.xsl.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="1.1.300",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.400,2.0.0)",
- org.eclipse.wst.xsl.core;bundle-version="[1.0.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.wst.xsl.ui.internal.validation;x-internal:=true,
- org.eclipse.wst.xsl.ui.tests;
-  uses:="org.eclipse.ui.dialogs,
-   org.osgi.framework,
-   org.eclipse.ui.plugin,
-   junit.framework,
-   org.eclipse.core.resources,
-   org.eclipse.core.runtime",
- org.eclipse.wst.xsl.ui.tests.contentassist,
- org.eclipse.wst.xsl.ui.tests.hyperlinkdetector,
- org.eclipse.wst.xsl.ui.tests.style,
- org.eclipse.wst.xsl.ui.tests.templates
-Bundle-Localization: plugin
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/about.html b/tests/org.eclipse.wst.xsl.ui.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/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/tests/org.eclipse.wst.xsl.ui.tests/build.properties b/tests/org.eclipse.wst.xsl.ui.tests/build.properties
deleted file mode 100644
index 252372b..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               projectfiles/,\
-               bin/,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml
-src.includes = src/,\
-               projectfiles/,\
-               META-INF/,\
-               build.properties
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/plugin.properties b/tests/org.eclipse.wst.xsl.ui.tests/plugin.properties
deleted file mode 100644
index 04fd6a5..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Properties file for org.eclipse.wst.xsl.ui.tests
-pluginName = Tests Plug-in
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/plugin.xml b/tests/org.eclipse.wst.xsl.ui.tests/plugin.xml
deleted file mode 100644
index 97d576a..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         id="org.eclipse.wst.xsl.test.xhtml"
-         name="XHTML Grammar Testing"
-         point="org.eclipse.wst.xml.core.catalogContributions">
-      <catalogContribution>
-         <uri
-               name="http://www.w3.org/1999/xhtml"
-               uri="http://www.w3.org/2002/08/xhtml/xhtml1-strict.xsd">
-         </uri>
-      </catalogContribution>
-   </extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/ChangeRequestsByResponsibility.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/ChangeRequestsByResponsibility.xsl
deleted file mode 100644
index 2ed1703..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/ChangeRequestsByResponsibility.xsl
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     David Carver - STAR - Stylesheet for testing purposes.
- *******************************************************************************/
- -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
-    
-    <xsl:param name="date"></xsl:param>
-
-    <xsl:include href="utils.xsl"/>
-    <xsl:template match="StarTeam">
-        <html>
-            <head>
-                <title>Change Request by Responsibility</title>
-            </head>
-            <body>
-                <p>
-                        <xsl:for-each-group select="ChangeRequest" group-by="AssignedTo">
-                            <table border="1">
-                                <caption><b>Change Requests Assigned To <xsl:value-of select="current-grouping-key()"/></b></caption>
-                                
-                                <xsl:call-template name="tableHeader"></xsl:call-template>
-                                
-                                <xsl:for-each select="current-group()">
-                                    <xsl:sort select="Status" order="descending"/>
-                                    <xsl:call-template name="ChangeRequest"/>
-                                </xsl:for-each>
-                            </table>
-                            
-                        </xsl:for-each-group>
-                </p>
-            </body>
-        </html>
-    </xsl:template>
-    
-    <xsl:template name="tableHeader">
-        <tr bgcolor="silver">
-            <td><strong>Number</strong></td>
-            <td><strong>Creation Date</strong></td>
-            <td><strong>Assigned To</strong></td>
-            <td><strong>Category</strong></td>
-            <td><strong>Component</strong></td>
-            <td><strong>Synopsis</strong></td>
-            <td><strong>Status</strong></td>
-        </tr>
-    </xsl:template>
-    
-    <xsl:template name="ChangeRequest">
-        <tr>
-            <td><xsl:value-of select="CRNumber"/></td>
-            <td>
-                <xsl:call-template name="long_date">
-                    <xsl:with-param name="date" select="CreatedOnDate"/>
-                </xsl:call-template>
-            </td>
-            <td><xsl:value-of select="AssignedTo"/></td>
-            <td><xsl:value-of select="Category"/></td>
-            <td><xsl:value-of select="Component"/></td>
-            <td><xsl:value-of select="Synopsis"/></td>
-            <td><xsl:value-of select="Status"/></td>
-        </tr>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/ChangeRequestsByStatus.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/ChangeRequestsByStatus.xsl
deleted file mode 100644
index a3d011f..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/ChangeRequestsByStatus.xsl
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     David Carver - STAR - Stylesheet for testing purposes.
- *******************************************************************************/
-
- -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
-    
-    <xsl:param name="date"></xsl:param>
-
-    <xsl:include href="utils.xsl"/>
-    <xsl:template match="StarTeam">
-        <html>
-            <head>
-                <title>Change Request by Status</title>
-            </head>
-            <body>
-                <p>
-                        <xsl:for-each-group select="ChangeRequest" group-by="Status">
-                            <table border="1">
-                                <caption><b>Change Request Status<xsl:value-of select="current-grouping-key()"/></b></caption>
-                                
-                                <xsl:call-template name="tableHeader"></xsl:call-template>
-                                
-                                <xsl:for-each select="current-group()">
-                                    <xsl:sort select="Category" order="descending"/>
-                                    <xsl:call-template name="ChangeRequest"/>
-                                </xsl:for-each>
-                            </table>
-                            
-                        </xsl:for-each-group>
-                </p>
-            </body>
-        </html>
-    </xsl:template>
-    
-    <xsl:template name="tableHeader">
-        <tr bgcolor="silver">
-            <td><strong>Number</strong></td>
-            <td><strong>Creation Date</strong></td>
-            <td><strong>Assigned To</strong></td>
-            <td><strong>Category</strong></td>
-            <td><strong>Component</strong></td>
-            <td><strong>Synopsis</strong></td>
-            <td><strong>Status</strong></td>
-        </tr>
-    </xsl:template>
-    
-    <xsl:template name="ChangeRequest">
-        <tr>
-            <td><xsl:value-of select="CRNumber"/></td>
-            <td>
-                <xsl:call-template name="long_date">
-                    <xsl:with-param name="date" select="CreatedOnDate"/>
-                </xsl:call-template>
-            </td>
-            <td><xsl:value-of select="AssignedTo"/></td>
-            <td><xsl:value-of select="Category"/></td>
-            <td><xsl:value-of select="Component"/></td>
-            <td><xsl:value-of select="Synopsis"/></td>
-            <td><xsl:value-of select="Status"/></td>
-        </tr>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/DraftReleaseCRs.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/DraftReleaseCRs.xsl
deleted file mode 100644
index 9383417..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/DraftReleaseCRs.xsl
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     David Carver - STAR - Stylesheet for testing purposes.
- *******************************************************************************/
-
- -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-    <xsl:param name="date"/>
-    <xsl:include href="utils.xsl"/>
-    <xsl:template match="StarTeam">
-        <html>
-            <head>
-                <title>Change Request by Responsibility</title>
-            </head>
-            <body>
-                <p>
-                    <table border="1">
-                        <caption>
-                            <b>Draft/Milestone Completed Change Requests</b>
-                        </caption>
-                        <xsl:call-template name="tableHeader"/>
-                        <xsl:for-each select="ChangeRequest[(Status = 'Fixed' or Status = 'In Progress') and (Category = 'XML' or Category = 'DTS')]">
-                            <xsl:sort select="ModifiedDate" order="descending"/>
-                            <xsl:sort select="AssignedTo" order="descending"/>
-                            <xsl:call-template name="ChangeRequest"/>
-                        </xsl:for-each>                        
-                    </table>
-                </p>
-            </body>
-        </html>
-    </xsl:template>
-    <xsl:template name="tableHeader">
-        <tr bgcolor="silver">
-            <td>
-                <strong>Number</strong>
-            </td>
-            <td>
-                <strong>Creation Date</strong>
-            </td>
-            <td>
-                <strong>Modified Date</strong>
-            </td>
-            <td>
-                <strong>Category</strong>
-            </td>
-            <td>
-                <strong>Component</strong>
-            </td>
-            <td>
-                <strong>Synopsis</strong>
-            </td>
-            <td>
-                <strong>Assigned To</strong>
-            </td>
-            <td>
-                <strong>Status</strong>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template name="ChangeRequest">
-        <tr>
-            <td>
-                <xsl:value-of select="CRNumber"/>
-            </td>
-            <td>
-                <xsl:call-template name="long_date">
-                    <xsl:with-param name="date" select="CreatedOnDate"/>
-                </xsl:call-template>
-            </td>
-            <td>
-                <xsl:call-template name="long_date">
-                    <xsl:with-param name="date" select="ModifiedDate"/>
-                </xsl:call-template>
-            </td>
-            <td>
-                <xsl:value-of select="Category"/>
-            </td>
-            <td>
-                <xsl:value-of select="Component"/>
-            </td>
-            <td>
-                <xsl:value-of select="Synopsis"/>
-            </td>
-            <td>
-                <xsl:value-of select="AssignedTo"/>
-            </td>
-            <td>
-                <xsl:value-of select="Status"/>
-            </td>
-        </tr>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/EmptyXSLFile.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/EmptyXSLFile.xsl
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/EmptyXSLFile.xsl
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/ListAllChangeRequests.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/ListAllChangeRequests.xsl
deleted file mode 100644
index 34df8de..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/ListAllChangeRequests.xsl
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     David Carver - STAR - Stylesheet for testing purposes.
- *******************************************************************************/
- -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-    
-    <xsl:param name="date"></xsl:param>
-
-    <xsl:include href="utils.xsl"/>
-    <xsl:template match="StarTeam">
-        <html>
-            <head>
-                <title>List All Change Requests</title>
-            </head>
-            <body>
-                <p>
-                    <table border="1">
-                        <caption><b>All Change Requests in XML/DTS</b></caption>
-                        <xsl:call-template name="tableHeader"></xsl:call-template>
-                        <xsl:for-each select="ChangeRequest">
-                            <xsl:sort select="Status"/>
-                            <xsl:call-template name="ChangeRequest"/>
-                        </xsl:for-each>
-                    </table>
-                </p>
-            </body>
-        </html>
-    </xsl:template>
-    
-    <xsl:template name="tableHeader">
-        <tr bgcolor="silver">
-            <td><strong>Number</strong></td>
-            <td><strong>Creation Date</strong></td>
-            <td><strong>Assigned To</strong></td>
-            <td><strong>Category</strong></td>
-            <td><strong>Component</strong></td>
-            <td><strong>Synopsis</strong></td>
-            <td><strong>Status</strong></td>
-        </tr>
-    </xsl:template>
-    
-    <xsl:template name="ChangeRequest">
-        <tr>
-            <td><xsl:value-of select="CRNumber"/></td>
-            <td>
-                <xsl:call-template name="long_date">
-                    <xsl:with-param name="date" select="CreatedOnDate"/>
-                </xsl:call-template>
-            </td>
-            <td><xsl:value-of select="AssignedTo"/></td>
-            <td><xsl:value-of select="Category"/></td>
-            <td><xsl:value-of select="Component"/></td>
-            <td><xsl:value-of select="Synopsis"/></td>
-            <td><xsl:value-of select="Status"/></td>
-        </tr>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/OutstandingCRs.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/OutstandingCRs.xsl
deleted file mode 100644
index 288034b..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/OutstandingCRs.xsl
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     David Carver - STAR - Stylesheet for testing purposes.
- *******************************************************************************/
- -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
-    <xsl:param name="date"/>
-    <xsl:include href="utils.xsl"/>
-    <xsl:template match="StarTeam">
-        <html>
-            <head>
-                <title>Outstanding/Unassigned Change Requests</title>
-            </head>
-            <body>
-                <p>
-                    <table border="1">
-                        <caption>
-                            <b>Outstanding/Unassigned Change Requests</b>
-                        </caption>
-                        <xsl:call-template name="tableHeader"/>
-                        <xsl:for-each select="ChangeRequest[Status = 'New']">
-                            <xsl:call-template name="ChangeRequest"/>
-                        </xsl:for-each>
-                    </table>
-                </p>
-            </body>
-        </html>
-    </xsl:template>
-    
-    <xsl:template name="tableHeader">
-        <tr bgcolor="silver">
-            <td>
-                <strong>Number</strong>
-            </td>
-            <td>
-                <strong>Creation Date</strong>
-            </td>
-            <td>
-                <strong>Assigned To</strong>
-            </td>
-            <td>
-                <strong>Category</strong>
-            </td>
-            <td>
-                <strong>Component</strong>
-            </td>
-            <td>
-                <strong>Synopsis</strong>
-            </td>
-            <td>
-                <strong>Status</strong>
-            </td>
-        </tr>
-    </xsl:template>
-    <xsl:template name="ChangeRequest">
-        <tr>
-            <td>
-                <xsl:value-of select="CRNumber"/>
-            </td>
-            <td>
-                <xsl:call-template name="long_date">
-                    <xsl:with-param name="date" select="CreatedOnDate"/>
-                </xsl:call-template>
-            </td>
-            <td>
-                <xsl:value-of select="AssignedTo"/>
-            </td>
-            <td>
-                <xsl:value-of select="Category"/>
-            </td>
-            <td>
-                <xsl:value-of select="Component"/>
-            </td>
-            <td>
-                <xsl:value-of select="Synopsis"/>
-            </td>
-            <td>
-                <xsl:value-of select="Status"/>
-            </td>
-        </tr>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestNamedTemplatesAssist.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestNamedTemplatesAssist.xsl
deleted file mode 100644
index 8b76c9a..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestNamedTemplatesAssist.xsl
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     David Carver - STAR - Stylesheet for testing purposes.
- *******************************************************************************/
-
- -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
-    
-    <xsl:param name="date"></xsl:param>
-
-    <xsl:include href="utils.xsl"/>
-    <xsl:template match="StarTeam">
-        <html>
-            <head>
-                <title>Change Request by Status</title>
-            </head>
-            <body>
-                <p>
-                  <xsl:for-each-group select="ChangeRequest" group-by="Status">
-                      <table border="1">
-                          <caption><b>Change Request Status<xsl:value-of select="current-grouping-key()"/></b></caption>
-                          
-                          <xsl:call-template name="tableHeader"></xsl:call-template>
-                          
-                          <xsl:for-each select="current-group()">
-                              <xsl:sort select="Category" order="descending"/>
-                              <xsl:call-template name="ChangeRequest"/>
-                          </xsl:for-each>
-                      </table>
-                      
-                  </xsl:for-each-group>
-                </p>
-            </body>
-        </html>
-    </xsl:template>
-    
-    <xsl:template name="">
-        <tr bgcolor="silver">
-            <td><strong>Number</strong></td>
-            <td><strong>Creation Date</strong></td>
-            <td><strong>Assigned To</strong></td>
-            <td><strong>Category</strong></td>
-            <td><strong>Component</strong></td>
-            <td><strong>Synopsis</strong></td>
-            <td><strong>Status</strong></td>
-        </tr>
-    </xsl:template>
-    
-    <xsl:template name="ChangeRequest">
-        <tr>
-            <td><xsl:value-of select="CRNumber"/></td>
-            <td>
-                <xsl:call-template name="long_date">
-                    <xsl:with-param name="date" select="CreatedOnDate"/>
-                </xsl:call-template>
-            </td>
-            <td><xsl:value-of select="AssignedTo"/></td>
-            <td><xsl:value-of select="Category"/></td>
-            <td><xsl:value-of select="Component"/></td>
-            <td><xsl:value-of select="Synopsis"/></td>
-            <td><xsl:value-of select="Status"/></td>
-        </tr>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestResultPrefixes.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestResultPrefixes.xsl
deleted file mode 100644
index d8eccba..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestResultPrefixes.xsl
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    exclude-result-prefixes="#all"
-    xmlns:xhtml="http://www.w3.org/1999/xhtml">
-	<xsl:template match="/">
-		<!-- TODO: Auto-generated template -->
-	</xsl:template>
-</xsl:stylesheet>
-<!-- 
-/*******************************************************************************
- * 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 - Stylesheet for testing purposes.
- *******************************************************************************/
- -->
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestResultPrefixesEmpty.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestResultPrefixesEmpty.xsl
deleted file mode 100644
index d03f3cf..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestResultPrefixesEmpty.xsl
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    exclude-result-prefixes=""
-    xmlns:xhtml="http://www.w3.org/1999/xhtml">
-	<xsl:template match="/">
-		<!-- TODO: Auto-generated template -->
-	</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestResultPrefixesWithXhtml.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestResultPrefixesWithXhtml.xsl
deleted file mode 100644
index 220b68a..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestResultPrefixesWithXhtml.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    exclude-result-prefixes="xhtml "
-    xmlns:xhtml="http://www.w3.org/1999/xhtml"
-    xmlns:test="http://www.examples.org/">
-	<xsl:template match="/">
-		<!-- TODO: Auto-generated template -->
-	</xsl:template>
-</xsl:stylesheet>
-<!-- 
-/*******************************************************************************
- * 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 - Stylesheet for testing purposes.
- *******************************************************************************/
- -->
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestXPathXMLProposals.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestXPathXMLProposals.xsl
deleted file mode 100644
index 08398ec..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/TestXPathXMLProposals.xsl
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    exclude-result-prefixes="#all"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<xsl:template match="/">
-		<xsl:for-each select="">
-		
-		</xsl:for-each>
-		<xsl:for-each select="/xsd:complexType/">
-		
-		</xsl:for-each>
-		<xsl:for-each select="xsd:complexType/xsd:">
-		
-		</xsl:for-each>
-	</xsl:template>
-</xsl:stylesheet>
-<!-- 
-/*******************************************************************************
- * 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 - Stylesheet for testing purposes.
- *******************************************************************************/
- -->
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/build.xml b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/build.xml
deleted file mode 100644
index e75226c..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/build.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== 
-     Sep 6, 2008 5:28:40 PM                                                        
-
-     ProjectZipFile
-     
-     ============================ -->
-<project name="ProjectZipFile" default="default">
-	
-    <target name="default" description="description">
-    	<zip destfile="projectfiles.zip" compress="true" update="true" >
-    		<zipfileset dir=".">
-    		   <include name="*.xsl"/>
-    		</zipfileset>
-    	</zip>
-    </target>
-
-</project>
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/calltemplateTest.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/calltemplateTest.xsl
deleted file mode 100644
index 6c59b1b..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/calltemplateTest.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     David Carver - STAR - Stylesheet for testing purposes.
- *******************************************************************************/
- -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:import href="utils.xsl"/>
-	<xsl:template match="/">
-		<xsl:call-template name="">
-            <xsl:with-param name="date">20080930</xsl:with-param>
-        </xsl:call-template>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/hrefs/mainFile.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/hrefs/mainFile.xsl
deleted file mode 100644
index acae6c0..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/hrefs/mainFile.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * 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
- *******************************************************************************/
- -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-	<xsl:include href="olib.xsl"/>
-	<xsl:include href="../olib.xsl"/>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/hrefs/olib.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/hrefs/olib.xsl
deleted file mode 100644
index 5fec68e..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/hrefs/olib.xsl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * 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
- *******************************************************************************/
- -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/hrefs/oneLevelUp/olib.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/hrefs/oneLevelUp/olib.xsl
deleted file mode 100644
index 5fec68e..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/hrefs/oneLevelUp/olib.xsl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * 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
- *******************************************************************************/
- -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/modeTest.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/modeTest.xsl
deleted file mode 100644
index ffccdd5..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/modeTest.xsl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-    <xsl:include href="modeTest2.xsl"/>
-	<xsl:template match="/">
-   
-	</xsl:template>
-    <xsl:template match="something" mode="mode1">
-    
-    </xsl:template>
-    <xsl:template match="something" mode="mode2">
-    
-    
-    </xsl:template>
-    <xsl:template name="something" mode="mode1">
-    
-    </xsl:template>
-    <xsl:template name="test" mode="">
-    
-    </xsl:template>
-    
-</xsl:stylesheet>
-<!-- 
-/*******************************************************************************
- * 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 - Stylesheet for testing purposes.
- *******************************************************************************/
- -->
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/modeTest2.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/modeTest2.xsl
deleted file mode 100644
index 610c0f4..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/modeTest2.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:template match="/" mode="mode3">
-		<!-- TODO: Auto-generated template -->
-	</xsl:template>
-</xsl:stylesheet>
-<!-- 
-/*******************************************************************************
- * 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 - Stylesheet for testing purposes.
- *******************************************************************************/
- -->
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/olib.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/olib.xsl
deleted file mode 100644
index 5fec68e..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/olib.xsl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * 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
- *******************************************************************************/
- -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/testElementProposals.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/testElementProposals.xsl
deleted file mode 100644
index 155c51b..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/testElementProposals.xsl
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:template match="/">
-		<html>
-            <body>
-               <
-            </body>
-        </html>
-	</xsl:template>
-</xsl:stylesheet>
-<!-- 
-/*******************************************************************************
- * 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 - Stylesheet for testing purposes.
- *******************************************************************************/
- -->
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/utils.xsl b/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/utils.xsl
deleted file mode 100644
index a28511a..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/projectfiles/utils.xsl
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     David Carver - STAR - Stylesheet for testing purposes.
- *******************************************************************************/
- -->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-    <xsl:template name="long_date">
-        <xsl:param name="date"/>
-        <!-- Month -->
-        <xsl:variable name="month" select="number(substring($date, 6, 2))"/>
-        <xsl:choose>
-            <xsl:when test="$month=1">January</xsl:when>
-            <xsl:when test="$month=2">February</xsl:when>
-            <xsl:when test="$month=3">March</xsl:when>
-            <xsl:when test="$month=4">April</xsl:when>
-            <xsl:when test="$month=5">May</xsl:when>
-            <xsl:when test="$month=6">June</xsl:when>
-            <xsl:when test="$month=7">July</xsl:when>
-            <xsl:when test="$month=8">August</xsl:when>
-            <xsl:when test="$month=9">September</xsl:when>
-            <xsl:when test="$month=10">October</xsl:when>
-            <xsl:when test="$month=11">November</xsl:when>
-            <xsl:when test="$month=12">December</xsl:when>
-            <xsl:otherwise>INVALID MONTH</xsl:otherwise>
-        </xsl:choose>
-        <xsl:text/> 
-        <!-- Day -->
-        <xsl:value-of select="number(substring($date, 9, 2))" />
-        <xsl:text>, </xsl:text>
-        <!-- Year -->
-        <xsl:value-of select="substring($date, 1, 4)" />
-       </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/internal/validation/TestDelegatingSourceValidatorForXSL.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/internal/validation/TestDelegatingSourceValidatorForXSL.java
deleted file mode 100755
index b9bcedc..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/internal/validation/TestDelegatingSourceValidatorForXSL.java
+++ /dev/null
@@ -1,190 +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 off of
- *                    XML Source Delgating Validator tests.
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.internal.validation;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.WorkbenchContext;
-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.IValidator;
-import org.eclipse.wst.xsl.ui.tests.AbstractXSLUITest;
-
-/**
- * Test the XML delegating source validator.
- *
- */
-public class TestDelegatingSourceValidatorForXSL extends AbstractXSLUITest 
-{
-	DelegatingSourceValidatorForXSL sourceValidator =  new DelegatingSourceValidatorForXSL();
-	
-	public TestDelegatingSourceValidatorForXSL() {
-		
-	}
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-	}
-	
-	@Override
-	protected void tearDown() throws Exception {
-		// TODO Auto-generated method stub
-		super.tearDown();
-	}
-	
-	
-	private String getxslTestFilesProjectName() {
-		return "xsltestfiles";
-	}
-	
-	/**
-	 * Test XPath 2.0 validation fails
-	 */
-	public void testXSLT2XPathPasses()
-	{
-		String projName = getxslTestFilesProjectName();
-		String fileName1 = "ChangeRequestsByResponsibility.xsl";
-
-		String validateFilePath = projName + File.separator + fileName1;
-
-		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
-
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
-		try {
-			project.create(description, new NullProgressMonitor());
-			project.open(new NullProgressMonitor());
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(validateFilePath));
-		if (file != null && !file.exists()) {
-			fail("Unable to locate " + fileName1 + " stylesheet.");
-		}
-		WorkbenchContext context = new WorkbenchContext();
-		List fileList = new ArrayList();
-		fileList.add(File.separator + validateFilePath);
-		context.setValidationFileURIs(fileList);
-		TestReporter reporter = new TestReporter();
-		try{
-			sourceValidator.validate(context, reporter);
-		}
-		catch(ValidationException e){
-			e.printStackTrace();
-		}
-		
-		assertFalse("Messages were reported on file with valid XPath 2.0", reporter.isMessageReported());
-	}
-	
-	public void testValidXSLT()
-	{
-		String projName = getxslTestFilesProjectName();
-		String fileName1 = "ListAllChangeRequests.xsl";
-
-		String validateFilePath = projName + File.separator + fileName1;
-
-		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(projName);
-
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
-		try {
-			project.create(description, new NullProgressMonitor());
-			project.open(new NullProgressMonitor());
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(validateFilePath));
-		if (file != null && !file.exists()) {
-			fail("Unable to locate " + fileName1 + " stylesheet.");
-		}
-		WorkbenchContext context = new WorkbenchContext();
-		List fileList = new ArrayList();
-		fileList.add(File.separator + validateFilePath);
-		context.setValidationFileURIs(fileList);
-		TestReporter reporter = new TestReporter();
-		try{
-			sourceValidator.validate(context, reporter);
-		}
-		catch(ValidationException e){
-			e.printStackTrace();
-		}
-		
-		assertFalse("Messages were reported on " + fileName1 + ".", reporter.isMessageReported());		
-	}
-	
-	
-	
-	private class TestReporter implements IReporter
-	{
-		protected boolean messageReported = false;
-		
-		public TestReporter(){
-			
-		}
-		
-		public void addMessage(IValidator origin, IMessage message) {
-			if (message.getSeverity() == IMessage.HIGH_SEVERITY)
-			{
-				messageReported = true;
-			}
-		}
-		
-		public boolean isMessageReported()
-		{
-			return messageReported;
-		}
-
-		public void displaySubtask(IValidator validator, IMessage message) {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public List getMessages() {
-			// TODO Auto-generated method stub
-			return null;
-		}
-
-		public boolean isCancelled() {
-			// TODO Auto-generated method stub
-			return false;
-		}
-
-		public void removeAllMessages(IValidator origin, Object object) {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public void removeAllMessages(IValidator origin) {
-			// TODO Auto-generated method stub
-			
-		}
-
-		public void removeMessageSubset(IValidator validator, Object obj, String groupName) {
-			// TODO Auto-generated method stub
-			
-		}
-		
-	}
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/AbstractXSLUITest.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/AbstractXSLUITest.java
deleted file mode 100644
index cb09a7a..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/AbstractXSLUITest.java
+++ /dev/null
@@ -1,181 +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.tests;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-
-/* 
- * Made abstract, so won't be automatically picked up as test (since intended to be subclassed).
- */
-public abstract class AbstractXSLUITest extends TestCase
-{
-	protected static IProject fTestProject;
-	private static boolean fTestProjectInitialized;
-	private static final String PROJECT_FILES = "projectfiles";
-	private static final String TEST_PROJECT_NAME = "xsltestfiles";
-
-	@Override
-	protected void setUp() throws Exception
-	{
-		super.setUp();
-		if (!fTestProjectInitialized)
-		{
-			getAndCreateProject();
-
-			File srcDir = XSLModelXMLTestsPlugin.getTestFile("/" + PROJECT_FILES);
-			String destinationProjectString = fTestProject.getLocation().toOSString();
-			String destinationFolder = destinationProjectString + "/";
-			File targetDir = new File(destinationProjectString);
-			copyDir(srcDir, targetDir);
-
-			fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-			fTestProjectInitialized = true;
-		}
-	}
-
-	private static void getAndCreateProject() throws CoreException
-	{
-		IWorkspace workspace = getWorkspace();
-		IWorkspaceRoot root = workspace.getRoot();
-		fTestProject = root.getProject(TEST_PROJECT_NAME);
-		createProject(fTestProject, null, null);
-		fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-		assertTrue(fTestProject.exists());
-	}
-
-	private static void createProject(IProject project, IPath locationPath, IProgressMonitor monitor) throws CoreException
-	{
-		if (monitor == null)
-		{
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask("creating test project", 10);
-		// create the project
-		try
-		{
-			if (!project.exists())
-			{
-				IProjectDescription desc = project.getWorkspace().newProjectDescription(project.getName());
-				if (Platform.getLocation().equals(locationPath))
-				{
-					locationPath = null;
-				}
-				desc.setLocation(locationPath);
-				project.create(desc, monitor);
-				monitor = null;
-			}
-			if (!project.isOpen())
-			{
-				project.open(monitor);
-				monitor = null;
-			}
-		}
-		finally
-		{
-			if (monitor != null)
-			{
-				monitor.done();
-			}
-		}
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace()
-	{
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	private static void copyDir(File src, File target) throws Exception
-	{
-		if (!target.exists())
-			target.mkdir();
-		File[] files = src.listFiles();
-		for (File file : files)
-		{
-			File toFile = new File(target, file.getName());
-			if (file.isDirectory())
-				copyDir(file, toFile);
-			else
-				copyFile(file, toFile);
-		}
-	}
-
-	private static void copyFile(File src, File target) throws Exception
-	{
-		BufferedOutputStream bos = null;
-		BufferedInputStream bis = null;
-		try
-		{
-			bos = new BufferedOutputStream(new FileOutputStream(target));
-			bis = new BufferedInputStream(new FileInputStream(src));
-			while (bis.available() > 0)
-			{
-				int size = bis.available();
-				if (size > 1024)
-					size = 1024;
-				byte[] b = new byte[size];
-				bis.read(b, 0, b.length);
-				bos.write(b);
-			}
-		}
-		catch (IOException e)
-		{
-			throw e;
-		}
-		finally
-		{
-			if (bis != null)
-			{
-				try
-				{
-					bis.close();
-				}
-				catch (IOException e)
-				{
-					throw e;
-				}
-			}
-			if (bos != null)
-			{
-				try
-				{
-					bos.close();
-				}
-				catch (IOException e)
-				{
-					throw e;
-				}
-			}
-		}
-	}
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/Activator.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/Activator.java
deleted file mode 100644
index d9a9eaf..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/Activator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.wst.xsl.ui.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.xsl.ui.tests";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (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 Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/XSLModelXMLTestsPlugin.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/XSLModelXMLTestsPlugin.java
deleted file mode 100755
index af49ca4..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/XSLModelXMLTestsPlugin.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class XSLModelXMLTestsPlugin extends Plugin {
-	//The shared instance.
-	private static XSLModelXMLTestsPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public XSLModelXMLTestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static XSLModelXMLTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		return key;
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return null;
-	}
-
-	public static URL getInstallLocation() {
-		URL installLocation = Platform.getBundle("org.eclipse.wst.xsl.ui.tests").getEntry("/");
-		URL resolvedLocation = null;
-		try {
-			resolvedLocation = FileLocator.resolve(installLocation);
-		}
-		catch (IOException e) {
-			// impossible
-			throw new Error(e);
-		}
-		return resolvedLocation;
-	}
-
-	public static File getTestFile(String filepath) {
-		URL installURL = getInstallLocation();
-		//String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		File result = new File(location);
-		return result;
-	}
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/XSLUITestSuite.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/XSLUITestSuite.java
deleted file mode 100755
index 6de319d..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/XSLUITestSuite.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 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.tests;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xsl.ui.internal.validation.TestDelegatingSourceValidatorForXSL;
-import org.eclipse.wst.xsl.ui.tests.contentassist.TestCallTemplateCompletionProposal;
-import org.eclipse.wst.xsl.ui.tests.contentassist.TestElementCompletionProposal;
-import org.eclipse.wst.xsl.ui.tests.contentassist.TestEmptyFileCompletionProposal;
-import org.eclipse.wst.xsl.ui.tests.contentassist.TestExcludeResultPrefixesCompletionProposal;
-import org.eclipse.wst.xsl.ui.tests.contentassist.TestHrefCompletionProposal;
-import org.eclipse.wst.xsl.ui.tests.contentassist.TestNamedTemplateCompletionProposal;
-import org.eclipse.wst.xsl.ui.tests.contentassist.TestTemplateModeCompletionProposal;
-import org.eclipse.wst.xsl.ui.tests.contentassist.TestXPathXMLCompletionProposal;
-import org.eclipse.wst.xsl.ui.tests.contentassist.XSLCompletionTest;
-import org.eclipse.wst.xsl.ui.tests.hyperlinkdetector.TestXSLHyperlinkDetector;
-import org.eclipse.wst.xsl.ui.tests.style.TestXMLRegionMap;
-import org.eclipse.wst.xsl.ui.tests.style.TestXSLLineStyleProvider;
-import org.eclipse.wst.xsl.ui.tests.style.TestXSLRegionMap;
-import org.eclipse.wst.xsl.ui.tests.templates.TestTemplateContextTypeXSL;
-
-
-public class XSLUITestSuite extends TestSuite {
-	public static Test suite() {
-		return new XSLUITestSuite();
-	}
-
-	public XSLUITestSuite() {
-		super("XSL UI Test Suite");
-		addTestSuite(TestDelegatingSourceValidatorForXSL.class);
-		addTestSuite(XSLCompletionTest.class);
-		addTestSuite(TestExcludeResultPrefixesCompletionProposal.class);
-		addTestSuite(TestTemplateModeCompletionProposal.class);
-		addTestSuite(TestHrefCompletionProposal.class);
-		addTestSuite(TestElementCompletionProposal.class);
-		addTestSuite(TestXSLLineStyleProvider.class);
-		addTestSuite(TestXMLRegionMap.class);
-		addTestSuite(TestXSLRegionMap.class);
-		addTestSuite(TestXSLHyperlinkDetector.class);
-		addTestSuite(TestNamedTemplateCompletionProposal.class);
-		addTestSuite(TestCallTemplateCompletionProposal.class);
-		addTestSuite(TestXPathXMLCompletionProposal.class);
-		addTestSuite(TestTemplateContextTypeXSL.class);
-		addTestSuite(TestEmptyFileCompletionProposal.class);
-	}
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/XSLUITestsPlugin.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/XSLUITestsPlugin.java
deleted file mode 100755
index 1eb0e67..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/XSLUITestsPlugin.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.tests;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class XSLUITestsPlugin extends AbstractUIPlugin {
-	//The shared instance.
-	private static XSLUITestsPlugin plugin;
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.xsl.ui.tests";
-
-	/**
-	 * The constructor.
-	 */
-	public XSLUITestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static XSLUITestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		return key;
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/AbstractCompletionProposalTest.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/AbstractCompletionProposalTest.java
deleted file mode 100644
index e137ec6..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/AbstractCompletionProposalTest.java
+++ /dev/null
@@ -1,165 +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.tests.contentassist;
-
-import java.io.IOException;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xsl.ui.internal.StructuredTextViewerConfigurationXSL;
-import org.eclipse.wst.xsl.ui.internal.contentassist.XSLContentAssistProcessor;
-import org.eclipse.wst.xsl.ui.tests.AbstractXSLUITest;
-
-/**
- * This class is an abstract class for Content Completion Tests. It provides all
- * of the common methods that are used by the completion tests so that they
- * aren't duplicated across the various classes. Overrides can be done where
- * appropriate.
- * 
- * @author David Carver
- * 
- */
-public class AbstractCompletionProposalTest extends AbstractXSLUITest {
-
-	protected String projectName = null;
-	protected String fileName = null;
-	protected IFile file = null;
-	protected IEditorPart textEditorPart = null;
-	protected ITextEditor editor = null;
-	protected XMLDocumentLoader xmlDocumentLoader = null;
-	protected IStructuredDocument document = null;
-	protected StructuredTextViewer sourceViewer = null;
-	protected IStructuredModel model;
-
-	public AbstractCompletionProposalTest() {
-	}
-
-	protected void initializeSourceViewer() {
-		// some test environments might not have a "real" display
-		if (Display.getCurrent() != null) {
-
-			Shell shell = null;
-			Composite parent = null;
-
-			if (PlatformUI.isWorkbenchRunning()) {
-				shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-						.getShell();
-			} else {
-				shell = new Shell(Display.getCurrent());
-			}
-			parent = new Composite(shell, SWT.NONE);
-
-			// dummy viewer
-			sourceViewer = new StructuredTextViewer(parent, null, null, false,
-					SWT.NONE);
-		} else {
-			Assert
-					.fail("Unable to run the test as a display must be available.");
-		}
-
-		configureSourceViewer();
-	}
-
-	protected void configureSourceViewer() {
-		sourceViewer.configure(new StructuredTextViewerConfigurationXSL());
-
-		sourceViewer.setDocument(document);
-	}
-
-	protected void setupProject() {
-		projectName = "xsltestfiles";
-		IProjectDescription description = ResourcesPlugin.getWorkspace()
-				.newProjectDescription(projectName);
-
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
-				projectName);
-		try {
-			project.create(description, new NullProgressMonitor());
-			project.open(new NullProgressMonitor());
-		} catch (CoreException e) {
-
-		}
-	}
-
-	protected void loadFileForTesting(String xslFilePath)
-			throws ResourceAlreadyExists, ResourceInUse, IOException,
-			CoreException {
-		file = ResourcesPlugin.getWorkspace().getRoot().getFile(
-				new Path(xslFilePath));
-		if (file != null && !file.exists()) {
-			Assert.fail("Unable to locate " + fileName + " stylesheet.");
-		}
-
-		loadXSLFile();
-
-		initializeSourceViewer();
-	}
-
-	protected void loadXSLFile() throws ResourceAlreadyExists, ResourceInUse,
-			IOException, CoreException {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		model = modelManager.getModelForEdit(file);
-		document = model.getStructuredDocument();
-
-	}
-
-	/**
-	 * Get the content completion proposals at <code>lineNumber</code>,
-	 * <code>columnNumber</code>.
-	 * 
-	 * @param lineNumber
-	 * @param columnNumber
-	 * @return
-	 * @throws Exception
-	 */
-	protected ICompletionProposal[] getProposals(int offset) throws Exception {
-		return new XSLContentAssistProcessor().computeCompletionProposals(
-				sourceViewer, offset);
-	}
-
-	/**
-	 * Setup the necessary projects, files, and source viewer for the tests.
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		setupProject();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestCallTemplateCompletionProposal.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestCallTemplateCompletionProposal.java
deleted file mode 100644
index 8144b73..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestCallTemplateCompletionProposal.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 (STAR) - bug 243575 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.tests.contentassist;
-
-import java.io.File;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-public class TestCallTemplateCompletionProposal extends
-		AbstractCompletionProposalTest {
-
-	public void testXSLPropsoalAvailable() throws Exception {
-		fileName = "calltemplateTest.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		int offset = 790;
-
-		try {
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-		} finally {
-			model.releaseFromEdit();
-		}
-		sourceViewer = null;
-	}
-
-	public void testUtilsProposalAvailable() throws Exception {
-		fileName = "calltemplateTest.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		int offset = 790;
-
-		try {
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-			assertEquals("Wrong proposal found.", "long_date", proposals[0]
-					.getDisplayString());
-		} finally {
-			model.releaseFromEdit();
-		}
-
-		sourceViewer = null;
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestElementCompletionProposal.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestElementCompletionProposal.java
deleted file mode 100644
index 279e06c..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestElementCompletionProposal.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 - intial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.tests.contentassist;
-
-import java.io.File;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * Tests everything about code completion and code assistance.
- * 
- */
-public class TestElementCompletionProposal extends
-		AbstractCompletionProposalTest {
-
-	public TestElementCompletionProposal() {
-		// TODO Auto-generated constructor stub
-	}
-
-	public void testXSLPropsoalAvailable() throws Exception {
-		fileName = "testElementProposals.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		// Column is off by one when calculating for the offset position
-		int column = 16;
-		int line = 5;
-
-		try {
-			int offset = document.getLineOffset(line) + column;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-		} finally {
-			model.releaseFromEdit();
-		}
-		sourceViewer = null;
-
-	}
-
-	public void testXSLApplyTemplatesPropsoalAvailable() throws Exception {
-		fileName = "testElementProposals.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		// Column is off by one when calculating for the offset position
-		int column = 16;
-		int line = 5;
-
-		try {
-			int offset = document.getLineOffset(line) + column;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-
-			String proposalName = "";
-			for (int cnt = 0; cnt < proposals.length; cnt++) {
-				if (proposals[cnt].getDisplayString().equals(
-						"xsl:apply-templates")) {
-					proposalName = proposals[cnt].getDisplayString();
-				}
-			}
-
-			assertEquals("Did not find expected proposal.",
-					"xsl:apply-templates", proposalName);
-		} finally {
-			model.releaseFromEdit();
-		}
-
-		sourceViewer = null;
-
-	}
-
-	public void testXSLChoosePropsoalAvailable() throws Exception {
-		fileName = "testElementProposals.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		// Column is off by one when calculating for the offset position
-		int column = 16;
-		int line = 5;
-
-		try {
-			int offset = document.getLineOffset(line) + column;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-
-			String proposalName = "";
-			for (int cnt = 0; cnt < proposals.length; cnt++) {
-				if (proposals[cnt].getDisplayString().equals("xsl:choose")) {
-					proposalName = proposals[cnt].getDisplayString();
-				}
-			}
-
-			assertEquals("Did not find expected proposal.", "xsl:choose",
-					proposalName);
-		} catch (Exception ex) {
-			model.releaseFromEdit();
-			throw ex;
-		} finally {
-			model.releaseFromEdit();
-		}
-
-		sourceViewer = null;
-	}
-
-	public void testXSLWhenPropsoalNotAvailable() throws Exception {
-		fileName = "testElementProposals.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		// Column is off by one when calculating for the offset position
-		int column = 16;
-		int line = 5;
-
-		try {
-			int offset = document.getLineOffset(line) + column;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-
-			String proposalName = "";
-			for (int cnt = 0; cnt < proposals.length; cnt++) {
-				if (proposals[cnt].getDisplayString().equals("xsl:when")) {
-					proposalName = proposals[cnt].getDisplayString();
-				}
-			}
-
-			assertFalse("xsl:when proposal found when it shouldn't have been.",
-					proposalName.equals("xsl:when"));
-		} catch (Exception ex) {
-			model.releaseFromEdit();
-			throw ex;
-		}
-		sourceViewer = null;
-	}
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestEmptyFileCompletionProposal.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestEmptyFileCompletionProposal.java
deleted file mode 100644
index 063b0e0..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestEmptyFileCompletionProposal.java
+++ /dev/null
@@ -1,36 +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) - bug 263843 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.tests.contentassist;
-
-import java.io.File;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-public class TestEmptyFileCompletionProposal extends
-		AbstractCompletionProposalTest {
-
-	public void testXSLPropsoalAvailable() throws Exception {
-		fileName = "EmptyXSLFile.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		int offset = 0;
-
-		try {
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-		} finally {
-			model.releaseFromEdit();
-		}
-		sourceViewer = null;
-	}
-
-
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestExcludeResultPrefixesCompletionProposal.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestExcludeResultPrefixesCompletionProposal.java
deleted file mode 100644
index a72ec97..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestExcludeResultPrefixesCompletionProposal.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 - intial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.tests.contentassist;
-
-import java.io.File;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * Tests everything about code completion and code assistance.
- * 
- */
-public class TestExcludeResultPrefixesCompletionProposal extends
-		AbstractCompletionProposalTest {
-
-	public TestExcludeResultPrefixesCompletionProposal() {
-		
-	}
-
-	public void testAllDefaultValueNoProposals() throws Exception {
-		fileName = "TestResultPrefixes.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		// Column is off by one when calculating for the offset position
-		int column = 29;
-		int line = 2;
-
-		try {
-			int offset = document.getLineOffset(line) + column;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertEquals("Found proposals when #all already in result value.",
-					0, proposals.length);
-		} finally {
-			model.releaseFromEdit();
-		}
-		sourceViewer = null;
-	}
-
-	public void testXHTMLNamespacePropsoalAvailable() throws Exception {
-		fileName = "TestResultPrefixesEmpty.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		// Column is off by one when calculating for the offset position
-		int column = 29;
-		int line = 2;
-
-		try {
-			int offset = document.getLineOffset(line) + column;
-			assertEquals("Line Offset incorrect:", 147, offset);
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-			assertEquals("Proposal length not 2.", 2, proposals.length);
-			assertEquals("Proposal did not find xhtml as proposal value.",
-					"xhtml", proposals[1].getDisplayString());
-		} finally {
-			model.releaseFromEdit();
-		}
-		sourceViewer = null;
-
-	}
-
-	public void testAllPropsoalAvailable() throws Exception {
-		fileName = "TestResultPrefixesEmpty.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		// Column is off by one when calculating for the offset position
-		int column = 29;
-		int line = 2;
-
-		try {
-			int offset = document.getLineOffset(line) + column;
-			assertEquals("Line Offset incorrect:", 147, offset);
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-			assertEquals("Proposal length not 2.", 2, proposals.length);
-			assertEquals("Proposal did not find xhtml as proposal value.",
-					"#all", proposals[0].getDisplayString());
-		} finally {
-			model.releaseFromEdit();
-		}
-		sourceViewer = null;
-
-	}
-
-	public void testExcludeXHTMLProposal() throws Exception {
-		fileName = "TestResultPrefixesWithXhtml.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		// Column is off by one when calculating for the offset position
-		int column = 35;
-		int line = 2;
-
-		try {
-			int offset = document.getLineOffset(line) + column;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-
-			for (int cnt = 0; cnt < proposals.length; cnt++) {
-				if (proposals[cnt].getDisplayString().equals("xhtml")) {
-					sourceViewer = null;
-					fail("XHTML Proposal found, when it should not have been!");
-				}
-			}
-		} finally {
-			model.releaseFromEdit();
-		}
-		sourceViewer = null;
-	}
-
-	public void testTestProposal() throws Exception {
-		fileName = "TestResultPrefixesWithXhtml.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		// Column is off by one when calculating for the offset position
-		int column = 35;
-		int line = 2;
-		try {
-			int offset = document.getLineOffset(line) + column;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-			assertFalse("Proposals returned more than one.",
-					proposals.length > 1);
-			assertEquals("Did not find test in proposal list", "test",
-					proposals[0].getDisplayString());
-		} finally {
-			model.releaseFromEdit();
-		}
-		sourceViewer = null;
-	}
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestHrefCompletionProposal.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestHrefCompletionProposal.java
deleted file mode 100644
index 4036b4e..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestHrefCompletionProposal.java
+++ /dev/null
@@ -1,62 +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.tests.contentassist;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * Tests everything about code completion and code assistance.
- * 
- */
-public class TestHrefCompletionProposal extends AbstractCompletionProposalTest {
-
-	public void testHrefProposalsAtStart() throws Exception {
-		fileName = projectName + File.separator + "hrefs" + File.separator + "mainFile.xsl";
-		loadFileForTesting(fileName);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		// Column is off by one when calculating for the offset position
-		int column = 25;
-		int line = 16;
-
-		try {
-			int offset = document.getLineOffset(line) + column;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertTrue("Incorrect number of proposals", proposals.length > 3);
-			doCommonTests(proposals);
-		} finally {
-			model.releaseFromEdit();
-		}
-
-		sourceViewer = null;
-	}
-
-	private void doCommonTests(ICompletionProposal[] proposals) {
-		int currDepth = 1;
-		for (ICompletionProposal completionProposal : proposals) {
-			System.out.println(completionProposal.getDisplayString());
-			IPath p = new Path(completionProposal.getDisplayString());
-			assertNotSame("Stylesheet must not include itself", new Path(
-					"mainFile.xsl"), p);
-			assertTrue(
-					"Proposals wrongly ordered - number of segments should increase down the list",
-					p.segmentCount() >= currDepth);
-			currDepth = p.segmentCount();
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestNamedTemplateCompletionProposal.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestNamedTemplateCompletionProposal.java
deleted file mode 100644
index fb5b316..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestNamedTemplateCompletionProposal.java
+++ /dev/null
@@ -1,44 +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.tests.contentassist;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-
-public class TestNamedTemplateCompletionProposal extends
-		AbstractCompletionProposalTest {
-
-	private void setupTestFile(String fileName) throws ResourceAlreadyExists,
-			ResourceInUse, IOException, CoreException {
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-	}
-
-	public void testXSLPropsoalAvailable() throws Exception {
-		setupTestFile("TestNamedTemplatesAssist.xsl");
-		int offset = 1810;
-
-		try {
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertEquals("Missing Proposals", 3, proposals.length);
-		} finally {
-			model.releaseFromEdit();
-		}
-
-		sourceViewer = null;
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestTemplateModeCompletionProposal.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestTemplateModeCompletionProposal.java
deleted file mode 100644
index bef17ac..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestTemplateModeCompletionProposal.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 - intial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.tests.contentassist;
-
-import java.io.File;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * Tests everything about code completion and code assistance.
- * 
- */
-public class TestTemplateModeCompletionProposal extends
-		AbstractCompletionProposalTest {
-
-	public TestTemplateModeCompletionProposal() {
-	}
-
-	public void testModeProposals() throws Exception {
-		fileName = "modeTest.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		// Column is off by one when calculating for the offset position
-		int column = 36;
-		int line = 16;
-
-		try {
-			int offset = document.getLineOffset(line) + column;
-			// assertEquals("Wrong offset returned", 471, offset);
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertProposalExists("\"#all\"", proposals);
-			assertProposalExists("mode1", proposals);
-			assertProposalExists("mode2", proposals);
-			assertProposalExists("mode3", proposals);
-		} finally {
-			model.releaseFromEdit();
-		}
-
-		sourceViewer = null;
-	}
-
-	private void assertProposalExists(String expected,
-			ICompletionProposal[] proposal) throws Exception {
-		assertNotNull("No proposals.", proposal);
-		boolean foundsw = false;
-		for (int i = 0; i < proposal.length; i++) {
-			if (proposal[i].getDisplayString().equals(expected)) {
-				foundsw = true;
-				break;
-			}
-		}
-
-		if (!foundsw) {
-			fail("Proposal " + expected
-					+ " was not found in the proposal list.");
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestXPathXMLCompletionProposal.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestXPathXMLCompletionProposal.java
deleted file mode 100644
index f163868..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/TestXPathXMLCompletionProposal.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 - intial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.tests.contentassist;
-
-import java.io.File;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-
-/**
- * Tests everything about code completion and code assistance.
- * 
- */
-public class TestXPathXMLCompletionProposal extends
-		AbstractCompletionProposalTest {
-
-	public TestXPathXMLCompletionProposal() {
-	}
-
-	public void testProposalsIncludeXSD() throws Exception {
-		fileName = "TestXPathXMLProposals.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		try {
-			loadFileForTesting(xslFilePath);
-
-			int offset = 253;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-
-			for (int i = 0; i < proposals.length; i++) {
-				if (proposals[i].getDisplayString().contains("xsd:")) {
-					return;
-				}
-			}
-		} finally {
-			model.releaseFromEdit();
-		}
-
-		sourceViewer = null;
-		fail("Did not find XSD proposals.");
-	}
-	
-	public void testProposalsIncludeAfterColon() throws Exception {
-		fileName = "TestXPathXMLProposals.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		try {
-			loadFileForTesting(xslFilePath);
-
-			int offset = 386;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-
-			for (int i = 0; i < proposals.length; i++) {
-				if (proposals[i].getDisplayString().contains("xsd:")) {
-					return;
-				}
-			}
-		} finally {
-			model.releaseFromEdit();
-		}
-
-		sourceViewer = null;
-		fail("Did not find XSD proposals.");
-	}
-	
-	public void testProposalsIncludeXSDAfterForwardSlash() throws Exception {
-		fileName = "TestXPathXMLProposals.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		try {
-			loadFileForTesting(xslFilePath);
-
-			int offset = 318;
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertNotNull("Did not find proposals.", proposals);
-
-			for (int i = 0; i < proposals.length; i++) {
-				if (proposals[i].getDisplayString().contains("xsd:")) {
-					return;
-				}
-			}
-		} finally {
-			model.releaseFromEdit();
-		}
-
-		sourceViewer = null;
-		fail("Did not find XSD proposals.");
-	}
-	
-	
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/XSLCompletionTest.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/XSLCompletionTest.java
deleted file mode 100755
index abec217..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/contentassist/XSLCompletionTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 - intial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.tests.contentassist;
-
-import java.io.File;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- * Tests everything about code completion and code assistance.
- * 
- */
-public class XSLCompletionTest extends AbstractCompletionProposalTest {
-
-	public XSLCompletionTest() {
-	}
-
-	public void testGetNodeAtLine15() throws Exception {
-		projectName = "xsltestfiles";
-		fileName = "utils.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-
-		try {
-		IDOMNode node = (IDOMNode) ContentAssistUtils.getNodeAt(sourceViewer,
-				631);
-		assertEquals("Wrong node name returned:", "xsl:stylesheet", node
-				.getNodeName());
-		} finally {
-			model.releaseFromEdit();
-		}
-
-	}
-
-	public void testGetNodeAtLine16() throws Exception {
-		projectName = "xsltestfiles";
-		fileName = "utils.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		
-		try {
-
-		IDOMNode node = (IDOMNode) ContentAssistUtils.getNodeAt(sourceViewer,
-				712);
-		assertEquals("Wrong node name returned:", "xsl:template", node
-				.getNodeName());
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-
-	public void testGetNodeAtLine17() throws Exception {
-		projectName = "xsltestfiles";
-		fileName = "utils.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-
-		try {
-		IDOMNode node = (IDOMNode) ContentAssistUtils.getNodeAt(sourceViewer,
-				748);
-		assertEquals("Wrong node name returned:", "xsl:param", node
-				.getNodeName());
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-
-	public void testAttributeNotValueAvailable() throws Exception {
-		projectName = "xsltestfiles";
-		fileName = "utils.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-
-		try {
-			ICompletionProposal[] proposals = getProposals(838);
-
-			assertTrue(proposals.length > 1);
-			ICompletionProposal proposal = proposals[0];
-			assertFalse("Found \"number(substring($date, 6, 2))\".", proposal
-					.getDisplayString().equals(
-							"\"number(substring($date, 6, 2))\""));
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-
-	public void testSelectAttributeProposalsAvailable() throws Exception {
-		projectName = "xsltestfiles";
-		fileName = "utils.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-
-		try {
-			int offset = sourceViewer.getDocument().getLineOffset(18) + 44;
-			String s = sourceViewer.getDocument().get(offset - 1, 6);
-			assertEquals("number", s);
-
-			ICompletionProposal[] proposals = getProposals(838);
-
-			assertTrue(proposals.length > 1);
-			ICompletionProposal proposal = proposals[3];
-			assertEquals("Wrong select item returned: ", "..", proposal
-					.getDisplayString());
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-
-	/**
-	 * Bug 240170
-	 * 
-	 * @throws Exception
-	 */
-	public void testSelectAttributeProposalsNarrow() throws Exception {
-		projectName = "xsltestfiles";
-		fileName = "utils.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-
-		try {
-			int offset = sourceViewer.getDocument().getLineOffset(18) + 44;
-			String s = sourceViewer.getDocument().get(offset - 9, 9);
-			assertEquals("select=\"n", s);
-
-			ICompletionProposal[] proposals = getProposals(offset);
-			assertEquals("Wrong xpath item returned: ", "name(node-set)",
-					proposals[0].getDisplayString());
-			assertEquals("Wrong Number of items returned: ", 6,
-					proposals.length);
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-
-	public void testTestAttributeProposalsAvailable() throws Exception {
-		projectName = "xsltestfiles";
-		fileName = "utils.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-
-		try {
-			ICompletionProposal[] proposals = getProposals(1753);
-			assertTrue(proposals.length >= 1);
-			ICompletionProposal proposal = proposals[0];
-			assertTrue("Wrong attribute proposal returned:", proposal
-					.getDisplayString().contains("disable-output-escaping"));
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-
-	public void testXSLElementProposalsAvailable() throws Exception {
-		projectName = "xsltestfiles";
-		fileName = "utils.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-
-		try {
-			ICompletionProposal[] proposals = getProposals(1569);
-			assertTrue(proposals.length >= 2);
-
-			ICompletionProposal proposal = proposals[1];
-			assertTrue("Can't find XSL element proposals.", proposal
-					.getDisplayString().equals("xsl:otherwise"));
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-	
-	/*
-	 * Bug 259575
-	 */
-	public void testXPathProposalAvaialbleAfterComma() throws Exception {
-		projectName = "xsltestfiles";
-		fileName = "utils.xsl";
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-
-		try {
-			ICompletionProposal[] proposals = getProposals(861);
-			assertTrue(proposals.length > 0);
-
-		} finally {
-			model.releaseFromEdit();
-		}
-		
-	}
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/hyperlinkdetector/TestXSLHyperlinkDetector.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/hyperlinkdetector/TestXSLHyperlinkDetector.java
deleted file mode 100644
index 7ba5909..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/hyperlinkdetector/TestXSLHyperlinkDetector.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 225418 - intial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.tests.hyperlinkdetector;
-
-import java.io.File;
-import java.io.IOException;
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-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.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-import org.eclipse.wst.xsl.ui.internal.StructuredTextViewerConfigurationXSL;
-import org.eclipse.wst.xsl.ui.internal.editor.XSLHyperlinkDetector;
-import org.eclipse.wst.xsl.ui.tests.AbstractXSLUITest;
-import org.eclipse.wst.xsl.core.internal.text.rules.StructuredTextPartitionerForXSL;
-
-/**
- * Tests everything about code completion and code assistance.
- * 
- */
-public class TestXSLHyperlinkDetector extends AbstractXSLUITest {
-
-	protected String projectName = null;
-	protected String fileName = null;
-	protected IFile file = null;
-	protected IEditorPart textEditorPart = null;
-	protected ITextEditor editor = null;
-
-	protected XMLDocumentLoader xmlDocumentLoader = null;
-	protected IStructuredDocument document = null;
-	protected StructuredTextViewer sourceViewer = null;
-	protected StructuredTextViewerConfigurationXSL xslConfiguration = new StructuredTextViewerConfigurationXSL();
-	protected String Partitioning = IDocumentExtension3.DEFAULT_PARTITIONING;
-	protected StructuredTextPartitionerForXSL defaultPartitioner = new StructuredTextPartitionerForXSL();
-
-	public TestXSLHyperlinkDetector() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * Setup the necessary projects, files, and source viewer for the tests.
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		setupProject();
-
-	}
-
-	protected void loadFileForTesting(String xslFilePath)
-			throws ResourceAlreadyExists, ResourceInUse, IOException,
-			CoreException {
-		file = ResourcesPlugin.getWorkspace().getRoot().getFile(
-				new Path(xslFilePath));
-		if (file != null && !file.exists()) {
-			Assert.fail("Unable to locate " + fileName + " stylesheet.");
-		}
-
-		loadXSLFile();
-
-		initializeSourceViewer();
-	}
-
-	protected void initializeSourceViewer() {
-		// some test environments might not have a "real" display
-		if (Display.getCurrent() != null) {
-
-			Shell shell = null;
-			Composite parent = null;
-
-			if (PlatformUI.isWorkbenchRunning()) {
-				shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-						.getShell();
-			} else {
-				shell = new Shell(Display.getCurrent());
-			}
-			parent = new Composite(shell, SWT.NONE);
-
-			// dummy viewer
-			sourceViewer = new StructuredTextViewer(parent, null, null, false,
-					SWT.NONE);
-		} else {
-			Assert
-					.fail("Unable to run the test as a display must be available.");
-		}
-
-		configureSourceViewer();
-	}
-
-	protected void configureSourceViewer() {
-		sourceViewer.configure(xslConfiguration);
-
-		sourceViewer.setDocument(document);
-	}
-
-	protected void setupProject() {
-		projectName = "xsltestfiles";
-		IProjectDescription description = ResourcesPlugin.getWorkspace()
-				.newProjectDescription(projectName);
-
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
-				projectName);
-		try {
-			project.create(description, new NullProgressMonitor());
-			project.open(new NullProgressMonitor());
-		} catch (CoreException e) {
-
-		}
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	private LineStyleProvider[] getLineStyleProviders() {
-		LineStyleProvider[] lineStyleProviders = xslConfiguration
-				.getLineStyleProviders(sourceViewer, IXMLPartitions.XML_DEFAULT);
-		return lineStyleProviders;
-	}
-
-	private void setUpTest(String file) throws ResourceAlreadyExists,
-			ResourceInUse, IOException, CoreException {
-		fileName = file;
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		assertNotNull("Missing Document Partitioner", document
-				.getDocumentPartitioner());
-	}
-
-	private IStructuredModel model = null;
-
-	protected void loadXSLFile() throws ResourceAlreadyExists, ResourceInUse,
-			IOException, CoreException {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		model = modelManager.getNewModelForEdit(file, true);
-		document = model.getStructuredDocument();
-		IDocumentPartitioner partitioner = defaultPartitioner.newInstance();
-		partitioner.connect(document);
-		document.setDocumentPartitioner(partitioner);
-	}
-
-	public void testDetectHyperlinksDocument() throws Exception {
-		setUpTest("DraftReleaseCRs.xsl");
-
-		try {
-			XSLHyperlinkDetector linkDetector = new XSLHyperlinkDetector();
-			int offset = 1200;
-			IRegion region = new Region(offset, 0);
-
-			boolean canShowMultipleLinks = true;
-			IHyperlink[] links = linkDetector.detectHyperlinks(document,
-					region, canShowMultipleLinks);
-			assertNotNull("No links returned", links);
-			assertEquals("Unexpected number of links", 1, links.length);
-		} finally {
-			model.releaseFromEdit();
-		}
-
-		sourceViewer = null;
-	}
-
-	public void testDetectHyperlinksViewer() throws Exception {
-		setUpTest("DraftReleaseCRs.xsl");
-
-		try {
-			XSLHyperlinkDetector linkDetector = new XSLHyperlinkDetector();
-			int offset = 1200;
-			IRegion region = new Region(offset, 0);
-
-			boolean canShowMultipleLinks = true;
-			IHyperlink[] links = linkDetector.detectHyperlinks(sourceViewer,
-					region, canShowMultipleLinks);
-			assertNotNull("No links returned", links);
-			assertEquals("Unexpected number of links", 1, links.length);
-		} finally {
-			model.releaseFromEdit();
-		}
-
-		sourceViewer = null;
-	}
-
-	public void testWithParmVariableLink() throws Exception {
-		setUpTest("DraftReleaseCRs.xsl");
-
-		try {
-			XSLHyperlinkDetector linkDetector = new XSLHyperlinkDetector();
-			int offset = 2741;
-			IRegion region = new Region(offset, 0);
-
-			boolean canShowMultipleLinks = true;
-			IHyperlink[] links = linkDetector.detectHyperlinks(sourceViewer,
-					region, canShowMultipleLinks);
-			assertNotNull("No links returned", links);
-			assertEquals("Unexpected number of links", 1, links.length);
-			IHyperlink link = links[0];
-			assertTrue("Wrong file returned.", link.getHyperlinkText()
-					.contains("utils.xsl"));
-		} finally {
-			model.releaseFromEdit();
-		}
-		sourceViewer = null;
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/style/TestXMLRegionMap.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/style/TestXMLRegionMap.java
deleted file mode 100644
index 2d8b153..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/style/TestXMLRegionMap.java
+++ /dev/null
@@ -1,243 +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 249716 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.tests.style;
-
-import java.util.Map;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
-import org.eclipse.wst.xsl.ui.internal.style.XMLRegionMap;
-import junit.framework.TestCase;
-
-public class TestXMLRegionMap extends TestCase {
-
-	public void testXMLContentRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_CONTENT));
-		assertEquals("Incorrect value", IStyleConstantsXML.XML_CONTENT, regionMap.get(DOMRegionContext.XML_CONTENT));
-		
-	}
-	
-	public void testXMLDocTypeInternalSubsettRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_DOCTYPE_INTERNAL_SUBSET));
-		assertEquals("Incorrect value", IStyleConstantsXML.XML_CONTENT, regionMap.get(DOMRegionContext.XML_DOCTYPE_INTERNAL_SUBSET));
-		
-	}
-	
-	public void testXMLTagOpenRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_TAG_OPEN));
-		assertEquals("Incorrect value", IStyleConstantsXML.TAG_BORDER, regionMap.get(DOMRegionContext.XML_TAG_OPEN));
-		
-	}
-
-	public void testXMLTagCloseRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_TAG_CLOSE));
-		assertEquals("Incorrect value", IStyleConstantsXML.TAG_BORDER, regionMap.get(DOMRegionContext.XML_TAG_CLOSE));
-		
-	}
-
-	public void testXMLEndTagOpenRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_END_TAG_OPEN));
-		assertEquals("Incorrect value", IStyleConstantsXML.TAG_BORDER, regionMap.get(DOMRegionContext.XML_END_TAG_OPEN));
-		
-	}
-
-	public void testXMLCDataOpenRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_CDATA_OPEN));
-		assertEquals("Incorrect value", IStyleConstantsXML.CDATA_BORDER, regionMap.get(DOMRegionContext.XML_CDATA_OPEN));
-		
-	}
-
-	public void testXMLCDataCloseRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_CDATA_CLOSE));
-		assertEquals("Incorrect value", IStyleConstantsXML.CDATA_BORDER, regionMap.get(DOMRegionContext.XML_CDATA_CLOSE));
-		
-	}
-
-	public void testXMLCDataTextRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_CDATA_TEXT));
-		assertEquals("Incorrect value", IStyleConstantsXML.CDATA_TEXT, regionMap.get(DOMRegionContext.XML_CDATA_TEXT));
-		
-	}
-	
-	public void testXMLTagAttributeNameRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME));
-		assertEquals("Incorrect value", IStyleConstantsXML.TAG_ATTRIBUTE_NAME, regionMap.get(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME));
-		
-	}
-	
-	public void testXMLDocTypeDeclartionRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_DOCTYPE_DECLARATION));
-		assertEquals("Incorrect value", IStyleConstantsXML.TAG_NAME, regionMap.get(DOMRegionContext.XML_DOCTYPE_DECLARATION));
-		
-	}
-	
-	public void testXMLTagNameRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_TAG_NAME));
-		assertEquals("Incorrect value", IStyleConstantsXML.TAG_NAME, regionMap.get(DOMRegionContext.XML_TAG_NAME));
-		
-	}
-	
-	public void testXMLTagAttributeValueRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE));
-		assertEquals("Incorrect value", IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, regionMap.get(DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE));
-		
-	}
-	
-	public void testXMLTagAttributeEqualsRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS));
-		assertEquals("Incorrect value", IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS, regionMap.get(DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS));
-	}
-	
-	public void testXMLCommentOpenRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_COMMENT_OPEN));
-		assertEquals("Incorrect value", IStyleConstantsXML.COMMENT_BORDER, regionMap.get(DOMRegionContext.XML_COMMENT_OPEN));
-	}
-	
-	public void testXMLCommentCloseRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_COMMENT_CLOSE));
-		assertEquals("Incorrect value", IStyleConstantsXML.COMMENT_BORDER, regionMap.get(DOMRegionContext.XML_COMMENT_CLOSE));
-	}
-	
-	public void testXMLCommentTextRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_COMMENT_TEXT));
-		assertEquals("Incorrect value", IStyleConstantsXML.COMMENT_TEXT, regionMap.get(DOMRegionContext.XML_COMMENT_TEXT));
-	}
-	
-	public void testXMLDocTypeNameRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_DOCTYPE_NAME));
-		assertEquals("Incorrect value", IStyleConstantsXML.DOCTYPE_NAME, regionMap.get(DOMRegionContext.XML_DOCTYPE_NAME));
-	}
-	
-	public void testXMLCharReferenceRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_CHAR_REFERENCE));
-		assertEquals("Incorrect value", IStyleConstantsXML.ENTITY_REFERENCE, regionMap.get(DOMRegionContext.XML_CHAR_REFERENCE));
-	}
-	
-	public void testXMLPeReferenceRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_PE_REFERENCE));
-		assertEquals("Incorrect value", IStyleConstantsXML.ENTITY_REFERENCE, regionMap.get(DOMRegionContext.XML_PE_REFERENCE));
-	}
-	
-	public void testXMLPIContentRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_PI_CONTENT));
-		assertEquals("Incorrect value", IStyleConstantsXML.PI_CONTENT, regionMap.get(DOMRegionContext.XML_PI_CONTENT));
-	}
-	
-	public void testXMLPIOpenRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_PI_OPEN));
-		assertEquals("Incorrect value", IStyleConstantsXML.PI_BORDER, regionMap.get(DOMRegionContext.XML_PI_OPEN));
-	}
-	
-	public void testXMLPICloseRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_PI_CLOSE));
-		assertEquals("Incorrect value", IStyleConstantsXML.PI_BORDER, regionMap.get(DOMRegionContext.XML_PI_CLOSE));
-	}
-	
-	public void testXMLDeclartionOpenRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_DECLARATION_OPEN));
-		assertEquals("Incorrect value", IStyleConstantsXML.DECL_BORDER, regionMap.get(DOMRegionContext.XML_DECLARATION_OPEN));
-	}
-	
-	public void testXMLDeclartionCloseRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_DECLARATION_CLOSE));
-		assertEquals("Incorrect value", IStyleConstantsXML.DECL_BORDER, regionMap.get(DOMRegionContext.XML_DECLARATION_CLOSE));
-	}
-	
-	public void testXMLDocTypeExternalIdSysrefRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF));
-		assertEquals("Incorrect value", IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, regionMap.get(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF));
-	}
-	
-	public void testXMLDocTypeExternalIdPubrefRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF));
-		assertEquals("Incorrect value", IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, regionMap.get(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF));
-	}
-	
-	public void testXMLDocTypeExternalIdPublicRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBLIC));
-		assertEquals("Incorrect value", IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, regionMap.get(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBLIC));
-	}
-	
-	public void testXMLDocTypeExternalIdSystemRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSTEM));
-		assertEquals("Incorrect value", IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, regionMap.get(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSTEM));
-	}
-	
-	public void testUndefinedRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.UNDEFINED));
-		assertEquals("Incorrect value", IStyleConstantsXML.CDATA_TEXT, regionMap.get(DOMRegionContext.UNDEFINED));
-	}
-	
-	public void testWhiteSpaceRegion() throws Exception {
-		XMLRegionMap xmlRegionMap = XMLRegionMap.getInstance();
-		Map<String, String> regionMap = xmlRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.WHITE_SPACE));
-		assertEquals("Incorrect value", IStyleConstantsXML.XML_CONTENT, regionMap.get(DOMRegionContext.WHITE_SPACE));
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/style/TestXSLLineStyleProvider.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/style/TestXSLLineStyleProvider.java
deleted file mode 100644
index c475c73..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/style/TestXSLLineStyleProvider.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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 - intial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsl.ui.tests.style;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewerExtension5;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceAlreadyExists;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.ResourceInUse;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.Highlighter;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-import org.eclipse.wst.xsl.ui.internal.StructuredTextViewerConfigurationXSL;
-import org.eclipse.wst.xsl.ui.tests.AbstractXSLUITest;
-import org.eclipse.wst.xsl.core.internal.text.rules.StructuredTextPartitionerForXSL;
-
-/**
- * Tests everything about code completion and code assistance.
- * 
- */
-public class TestXSLLineStyleProvider extends AbstractXSLUITest {
-
-	protected String projectName = null;
-	protected String fileName = null;
-	protected IFile file = null;
-	protected IEditorPart textEditorPart = null;
-	protected ITextEditor editor = null;
-
-	protected XMLDocumentLoader xmlDocumentLoader = null;
-	protected IStructuredDocument document = null;
-	protected StructuredTextViewer sourceViewer = null;
-	protected StructuredTextViewerConfigurationXSL xslConfiguration = new StructuredTextViewerConfigurationXSL();
-	protected String Partitioning = IDocumentExtension3.DEFAULT_PARTITIONING;
-	protected StructuredTextPartitionerForXSL defaultPartitioner = new StructuredTextPartitionerForXSL();
-
-	public TestXSLLineStyleProvider() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/**
-	 * Setup the necessary projects, files, and source viewer for the tests.
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		setupProject();
-
-	}
-
-	protected void loadFileForTesting(String xslFilePath)
-			throws ResourceAlreadyExists, ResourceInUse, IOException,
-			CoreException {
-		file = ResourcesPlugin.getWorkspace().getRoot().getFile(
-				new Path(xslFilePath));
-		if (file != null && !file.exists()) {
-			Assert.fail("Unable to locate " + fileName + " stylesheet.");
-		}
-
-		loadXSLFile();
-
-		initializeSourceViewer();
-	}
-
-	protected void initializeSourceViewer() {
-		// some test environments might not have a "real" display
-		if (Display.getCurrent() != null) {
-
-			Shell shell = null;
-			Composite parent = null;
-
-			if (PlatformUI.isWorkbenchRunning()) {
-				shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-						.getShell();
-			} else {
-				shell = new Shell(Display.getCurrent());
-			}
-			parent = new Composite(shell, SWT.NONE);
-
-			// dummy viewer
-			sourceViewer = new StructuredTextViewer(parent, null, null, false,
-					SWT.NONE);
-		} else {
-			Assert
-					.fail("Unable to run the test as a display must be available.");
-		}
-
-		configureSourceViewer();
-	}
-
-	protected void configureSourceViewer() {
-		sourceViewer.configure(xslConfiguration);
-
-		sourceViewer.setDocument(document);
-	}
-
-	private IStructuredModel model = null;
-
-	protected void loadXSLFile() throws ResourceAlreadyExists, ResourceInUse,
-			IOException, CoreException {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		model = modelManager.getNewModelForEdit(file, true);
-		document = model.getStructuredDocument();
-		IDocumentPartitioner partitioner = defaultPartitioner.newInstance();
-		partitioner.connect(document);
-		document.setDocumentPartitioner(partitioner);
-	}
-
-	protected void setupProject() {
-		projectName = "xsltestfiles";
-		IProjectDescription description = ResourcesPlugin.getWorkspace()
-				.newProjectDescription(projectName);
-
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
-				projectName);
-		try {
-			project.create(description, new NullProgressMonitor());
-			project.open(new NullProgressMonitor());
-		} catch (CoreException e) {
-
-		}
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	private LineStyleProvider[] getLineStyleProviders() {
-		LineStyleProvider[] lineStyleProviders = xslConfiguration
-				.getLineStyleProviders(sourceViewer, IXMLPartitions.XML_DEFAULT);
-		return lineStyleProviders;
-	}
-
-	private void setUpTest(String file) throws ResourceAlreadyExists,
-			ResourceInUse, IOException, CoreException {
-		fileName = file;
-		String xslFilePath = projectName + File.separator + fileName;
-		loadFileForTesting(xslFilePath);
-		IStructuredDocument document = (IStructuredDocument) sourceViewer
-				.getDocument();
-		assertNotNull("Missing Document Partitioner", document
-				.getDocumentPartitioner());
-	}
-
-	private LineStyleProvider initializeProvider() {
-		LineStyleProvider[] lineStyleProviders = getLineStyleProviders();
-		LineStyleProvider lineStyleProvider = lineStyleProviders[0];
-
-		Highlighter highlighter = new Highlighter();
-		lineStyleProvider.init(document, highlighter);
-		return lineStyleProvider;
-	}
-
-	private IRegion getDocumentRangeFromWidgetRange(int offset, int length) {
-		IRegion styleRegion = null;
-		if (sourceViewer instanceof ITextViewerExtension5) {
-			ITextViewerExtension5 extension = sourceViewer;
-			styleRegion = extension.widgetRange2ModelRange(new Region(offset,
-					length));
-		} else {
-			IRegion vr = null;
-			if (sourceViewer != null)
-				vr = sourceViewer.getVisibleRegion();
-			else
-				vr = new Region(0, document.getLength());
-
-			if (offset <= vr.getLength()) {
-				styleRegion = new Region(offset + vr.getOffset(), length);
-			}
-		}
-		return styleRegion;
-	}
-
-	private void applyStyles(LineStyleProvider provider,
-			ITypedRegion[] partitions, ArrayList holdStyleResults) {
-		for (int i = 0; i < partitions.length; i++) {
-			ITypedRegion currentPartition = partitions[i];
-			boolean handled = provider.prepareRegions(currentPartition,
-					currentPartition.getOffset(), currentPartition.getLength(),
-					holdStyleResults);
-			if (Debug.syntaxHighlighting && !handled) {
-				System.out
-						.println("Did not handle highlighting in Highlighter inner while"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public void testHasLineStyleProvider() throws Exception {
-		setUpTest("utils.xsl");
-
-		try {
-			LineStyleProvider[] lineStyleProviders = getLineStyleProviders();
-			assertNotNull("No line style providers found.", lineStyleProviders);
-			assertEquals("Wrong number of providers", 1,
-					lineStyleProviders.length);
-		} finally {
-			model.releaseFromEdit();
-		}
-		sourceViewer = null;
-
-	}
-
-	public void testInitializeLineStyleProvider() throws Exception {
-		setUpTest("utils.xsl");
-		try {
-			initializeProvider();
-		} finally {
-			model.releaseFromEdit();
-		}
-		sourceViewer = null;
-	}
-
-	public void testPrepareRegion() throws Exception {
-		setUpTest("utils.xsl");
-		try {
-			LineStyleProvider provider = initializeProvider();
-			int startOffset = document.getFirstStructuredDocumentRegion()
-					.getStartOffset();
-			int endLineLength = document.getLength();
-
-			IRegion styleRegion = getDocumentRangeFromWidgetRange(startOffset,
-					endLineLength);
-			ITypedRegion[] partitions = TextUtilities.computePartitioning(
-					document, Partitioning, styleRegion.getOffset(),
-					styleRegion.getLength(), false);
-
-			assertTrue("No Partitions found.", partitions.length > 0);
-			ArrayList holdStyleResults = new ArrayList();
-			applyStyles(provider, partitions, holdStyleResults);
-			assertFalse("No styles applied.", holdStyleResults.isEmpty());
-			assertEquals("Unexpected StyleRange size", 221, holdStyleResults
-					.size());
-		} finally {
-			model.releaseFromEdit();
-		}
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/style/TestXSLRegionMap.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/style/TestXSLRegionMap.java
deleted file mode 100644
index 2f98d3e..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/style/TestXSLRegionMap.java
+++ /dev/null
@@ -1,78 +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 249716 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.ui.tests.style;
-
-import java.util.Map;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xsl.ui.internal.style.IStyleConstantsXSL;
-import org.eclipse.wst.xsl.ui.internal.style.XSLRegionMap;
-
-import junit.framework.TestCase;
-
-public class TestXSLRegionMap extends TestCase {
-
-	public void testXSLTagOpenContentRegion() throws Exception {
-		XSLRegionMap xslRegionMap = XSLRegionMap.getInstance();
-		Map<String, String> regionMap = xslRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_TAG_OPEN));
-		assertEquals("Incorrect value", IStyleConstantsXSL.TAG_BORDER, regionMap.get(DOMRegionContext.XML_TAG_OPEN));
-		
-	}
-	
-	public void testXSLEndTagOpenContentRegion() throws Exception {
-		XSLRegionMap xslRegionMap = XSLRegionMap.getInstance();
-		Map<String, String> regionMap = xslRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_END_TAG_OPEN));
-		assertEquals("Incorrect value", IStyleConstantsXSL.TAG_BORDER, regionMap.get(DOMRegionContext.XML_END_TAG_OPEN));
-		
-	}
-	
-	public void testXSLTagCloseContentRegion() throws Exception {
-		XSLRegionMap xslRegionMap = XSLRegionMap.getInstance();
-		Map<String, String> regionMap = xslRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_TAG_CLOSE));
-		assertEquals("Incorrect value", IStyleConstantsXSL.TAG_BORDER, regionMap.get(DOMRegionContext.XML_TAG_CLOSE));
-		
-	}
-	
-	public void testXSLEmptyTagCloseRegion() throws Exception {
-		XSLRegionMap xslRegionMap = XSLRegionMap.getInstance();
-		Map<String, String> regionMap = xslRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_EMPTY_TAG_CLOSE));
-		assertEquals("Incorrect value", IStyleConstantsXSL.TAG_BORDER, regionMap.get(DOMRegionContext.XML_EMPTY_TAG_CLOSE));
-		
-	}
-	
-	public void testXSLTagAttributeNameRegion() throws Exception {
-		XSLRegionMap xslRegionMap = XSLRegionMap.getInstance();
-		Map<String, String> regionMap = xslRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME));
-		assertEquals("Incorrect value", IStyleConstantsXSL.TAG_ATTRIBUTE_NAME, regionMap.get(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME));
-		
-	}
-	
-	public void testXSLTagNameRegion() throws Exception {
-		XSLRegionMap xslRegionMap = XSLRegionMap.getInstance();
-		Map<String, String> regionMap = xslRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_TAG_NAME));
-		assertEquals("Incorrect value", IStyleConstantsXSL.TAG_NAME, regionMap.get(DOMRegionContext.XML_TAG_NAME));
-		
-	}
-	
-	public void testXSLTagAttributeValueRegion() throws Exception {
-		XSLRegionMap xslRegionMap = XSLRegionMap.getInstance();
-		Map<String, String> regionMap = xslRegionMap.getRegionMap();
-		assertNotNull("Region Not Found", regionMap.get(DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE));
-		assertEquals("Incorrect value", IStyleConstantsXSL.TAG_ATTRIBUTE_VALUE, regionMap.get(DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE));
-		
-	}
-	
-}
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/templates/TestTemplateContextTypeXSL.java b/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/templates/TestTemplateContextTypeXSL.java
deleted file mode 100644
index 4693e6f..0000000
--- a/tests/org.eclipse.wst.xsl.ui.tests/src/org/eclipse/wst/xsl/ui/tests/templates/TestTemplateContextTypeXSL.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.eclipse.wst.xsl.ui.tests.templates;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.text.templates.TemplateVariableResolver;
-import org.eclipse.wst.xsl.ui.internal.templates.TemplateContextTypeXSL;
-
-import junit.framework.TestCase;
-
-public class TestTemplateContextTypeXSL extends TestCase {
-
-	public void testXSLTemplateContextType() throws Exception {
-		TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
-	}
-	
-	public void testCursorVariableAvailable() throws Exception {
-		TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
-		Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-		
-		while (variables.hasNext()) {
-		   TemplateVariableResolver resolver = variables.next();	
-		   if (resolver.getType().equals("cursor")) {
-			   return;
-		   }
-		}
-		
-		fail("Cursor variable resolver was not found.");
-	}
-	
-	public void testDateVariableAvailable() throws Exception {
-		TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
-		Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-		
-		while (variables.hasNext()) {
-		   TemplateVariableResolver resolver = variables.next();	
-		   if (resolver.getType().equals("date")) {
-			   return;
-		   }
-		}
-		
-		fail("Date variable resolver was not found.");
-	}
-
-	public void testYearVariableAvailable() throws Exception {
-		TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
-		Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-		
-		while (variables.hasNext()) {
-		   TemplateVariableResolver resolver = variables.next();	
-		   if (resolver.getType().equals("year")) {
-			   return;
-		   }
-		}
-		
-		fail("Year variable resolver was not found.");
-	}
-	
-	public void testTimeVariableAvailable() throws Exception {
-		TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
-		Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-		
-		while (variables.hasNext()) {
-		   TemplateVariableResolver resolver = variables.next();	
-		   if (resolver.getType().equals("time")) {
-			   return;
-		   }
-		}
-		
-		fail("Time variable resolver was not found.");
-	}
-	
-	public void testUserVariableAvailable() throws Exception {
-		TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
-		Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-		
-		while (variables.hasNext()) {
-		   TemplateVariableResolver resolver = variables.next();	
-		   if (resolver.getType().equals("user")) {
-			   return;
-		   }
-		}
-		
-		fail("User variable resolver was not found.");
-	}
-	
-	public void testDollarVariableAvailable() throws Exception {
-		TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
-		Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-		
-		while (variables.hasNext()) {
-		   TemplateVariableResolver resolver = variables.next();	
-		   if (resolver.getType().equals("dollar")) {
-			   return;
-		   }
-		}
-		
-		fail("User variable resolver was not found.");
-	}
-	
-	public void testWordSelectionVariableAvailable() throws Exception {
-		TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
-		Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-		
-		while (variables.hasNext()) {
-		   TemplateVariableResolver resolver = variables.next();	
-		   if (resolver.getType().equals("word_selection")) {
-			   return;
-		   }
-		}
-		
-		fail("Word Selection variable resolver was not found.");
-	}
-
-	public void testLineSelectionVariableAvailable() throws Exception {
-		TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
-		Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-		
-		while (variables.hasNext()) {
-		   TemplateVariableResolver resolver = variables.next();	
-		   if (resolver.getType().equals("line_selection")) {
-			   return;
-		   }
-		}
-		
-		fail("Line Selection variable resolver was not found.");
-	}
-	
-	public void testXMLEncodingVariableAvailable() throws Exception {
-		TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
-		Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-		
-		while (variables.hasNext()) {
-		   TemplateVariableResolver resolver = variables.next();	
-		   if (resolver.getType().equals("encoding")) {
-			   return;
-		   }
-		}
-		
-		fail("Encoding Selection variable resolver was not found.");
-	}
-	
-	public void testXSLVersionVariableAvailable() throws Exception {
-		TemplateContextTypeXSL contextType = new TemplateContextTypeXSL();
-		Iterator<TemplateVariableResolver> variables = contextType.resolvers();
-		
-		while (variables.hasNext()) {
-		   TemplateVariableResolver resolver = variables.next();	
-		   if (resolver.getType().equals("xsl_version")) {
-			   return;
-		   }
-		}
-		
-		fail("XSL Version variable resolver was not found.");
-	}
-	
-	
-	
-}