1591 files changed, 0 insertions, 83071 deletions
diff --git a/features/org.eclipse.wst.web_tests.feature/.cvsignore b/features/org.eclipse.wst.web_tests.feature/.cvsignore
deleted file mode 100644
index 62260a46f..000000000
--- a/features/org.eclipse.wst.web_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.web_tests.feature_*.zip
diff --git a/features/org.eclipse.wst.web_tests.feature/.project b/features/org.eclipse.wst.web_tests.feature/.project
deleted file mode 100644
index 8d3270d0a..000000000
--- a/features/org.eclipse.wst.web_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web_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.web_tests.feature/build.properties b/features/org.eclipse.wst.web_tests.feature/build.properties
deleted file mode 100644
index 27affc577..000000000
--- a/features/org.eclipse.wst.web_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.wst.web_tests.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.wst.web_tests.feature/epl-v10.html b/features/org.eclipse.wst.web_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.wst.web_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.web_tests.feature/feature.properties b/features/org.eclipse.wst.web_tests.feature/feature.properties
deleted file mode 100644
index 17348fe95..000000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-# 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=WST Web Tests
-
-# "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=WST Web tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_tests.feature/feature.xml b/features/org.eclipse.wst.web_tests.feature/feature.xml
deleted file mode 100644
index a22b46fad..000000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_tests.feature"
-      label="%featureName"
-      version="1.6.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/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.wst.css.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.css.tests.encoding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.css.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.css.ui.tests.performance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.html.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.html.tests.encoding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.html.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.html.ui.tests.performance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_tests.feature/license.html b/features/org.eclipse.wst.web_tests.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.wst.web_tests.feature/license.html
+++ /dev/null
@@ -1,93 +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>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "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></UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_tests.feature/.cvsignore b/features/org.eclipse.wst.xml_tests.feature/.cvsignore
deleted file mode 100644
index cac99d0ea..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.xml_tests.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.xml_tests.feature/.project b/features/org.eclipse.wst.xml_tests.feature/.project
deleted file mode 100644
index 3ff3287f0..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_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.xml_tests.feature/build.properties b/features/org.eclipse.wst.xml_tests.feature/build.properties
deleted file mode 100644
index 27affc577..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708ad..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/org.eclipse.wst.xml_tests.feature/epl-v10.html b/features/org.eclipse.wst.xml_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b19665..000000000
--- a/features/org.eclipse.wst.xml_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.xml_tests.feature/feature.properties b/features/org.eclipse.wst.xml_tests.feature/feature.properties
deleted file mode 100644
index 8664e9e79..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.properties
+++ /dev/null
@@ -1,144 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-# 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=WST XML Tests
-
-# "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=WST XML tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.xml b/features/org.eclipse.wst.xml_tests.feature/feature.xml
deleted file mode 100644
index 376d1b1f5..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_tests.feature"
-      label="%featureName"
-      version="1.6.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.wst.dtd.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.validation.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.ui.tests.performance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.core.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.tests.encoding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.ui.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.ui.tests.performance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.validation.tests"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.tests.performance"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
-\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_tests.feature/license.html b/features/org.eclipse.wst.xml_tests.feature/license.html
deleted file mode 100644
index 2347060ef..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/license.html
+++ /dev/null
@@ -1,93 +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>January 28, 2005</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "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></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.jst.jsp.core.tests/.classpath b/tests/org.eclipse.jst.jsp.core.tests/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore b/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
deleted file mode 100644
index f35525c09..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-org.eclipse.jst.jsp.core.tests_1.0.0.jar
-jspcoretests.jar
-temp.folder
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.project b/tests/org.eclipse.jst.jsp.core.tests/.project
deleted file mode 100644
index 3e3350fb8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsp.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.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index b3a432263..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsp.core.tests
-Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: jspcoretests.jar
-Bundle-Activator: org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.core.tests,
- org.eclipse.jst.jsp.core.tests.cleanupformat,
- org.eclipse.jst.jsp.core.tests.cleanupformat.testfiles,
- org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific,
- org.eclipse.jst.jsp.core.tests.dom,
- org.eclipse.jst.jsp.core.tests.model,
- org.eclipse.jst.jsp.core.tests.taglibindex
-Require-Bundle: org.junit,
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.css.core,
- com.ibm.icu,
- org.eclipse.wst.validation,
- org.eclipse.jdt.core,
- org.eclipse.wst.sse.ui
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.jst.jsp.core.tests/about.html b/tests/org.eclipse.jst.jsp.core.tests/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.jst.jsp.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.jst.jsp.core.tests/build.properties b/tests/org.eclipse.jst.jsp.core.tests/build.properties
deleted file mode 100644
index 2700825c6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/build.properties
+++ /dev/null
@@ -1,25 +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
-###############################################################################
-bin.includes = test.xml,\
-               jspcoretests.jar,\
-               META-INF/,\
-               about.html,\
-               testfiles/,\
-               plugin.properties,\
-               src/org/eclipse/jst/jsp/css/core/tests/testfiles/
-jars.compile.order = jspcoretests.jar
-source.jspcoretests.jar = src/
-output.jspcoretests.jar = bin/
-src.includes = test.xml,\
-               META-INF/,\
-               testfiles/,\
-               about.html,\
-               plugin.properties
diff --git a/tests/org.eclipse.jst.jsp.core.tests/plugin.properties b/tests/org.eclipse.jst.jsp.core.tests/plugin.properties
deleted file mode 100644
index f13db3761..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.jst.jsp.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JSP Core Tests
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java
deleted file mode 100644
index 26d4effcf..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCorePreferencesTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jst.jsp.core.internal.JSPCorePlugin;
-import org.eclipse.jst.jsp.core.internal.encoding.JSPDocumentLoader;
-import org.eclipse.jst.jsp.core.internal.preferences.JSPCorePreferenceNames;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the JSP Source editor
- * preferences. Tests include setting/getting preferences.
- * 
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class JSPCorePreferencesTest extends TestCase {
-	/**
-	 * Tests existance of preference values when getting preference values
-	 * through Platform.getPreferencesService()
-	 */
-	public void testBundleGetPreferences() {
-		final String bundleName = "org.eclipse.jst.jsp.core";
-
-		// need to start up bundle for default values to be loaded
-		Bundle bundle = Platform.getBundle(bundleName);
-		try {
-			if (bundle != null)
-				bundle.start();
-			else
-				fail("Get preference value failed because could not find bundle: " + bundleName);
-		}
-		catch (BundleException e) {
-			fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
-		}
-
-		bundleGetPreference(bundleName, JSPCorePreferenceNames.DEFAULT_EXTENSION);
-	}
-
-	private void bundleGetPreference(String bundleName, String prefKey) {
-		String defaultValue = null;
-
-		String value = Platform.getPreferencesService().getString(bundleName, prefKey, defaultValue, null);
-		assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
-	}
-
-	/**
-	 * Tests default values of preferences.
-	 * 
-	 * NOTE: Expected default values are hard-coded, so if default values do
-	 * get changed, assertions need to be updated as well
-	 */
-	public void testPluginGetDefaultPreferences() {
-		IEclipsePreferences node = new DefaultScope().getNode(JSPCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		pluginGetDefaultPreference(node, JSPCorePreferenceNames.VALIDATE_FRAGMENTS, Boolean.toString(true));
-	}
-
-	private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
-		String defaultValue = Long.toString(System.currentTimeMillis()); // random
-		// string
-
-		String theDefaultValue = node.get(prefKey, defaultValue);
-		assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
-	}
-
-	/**
-	 * Tests setting preference values by setting preference value to be a
-	 * certain value, then getting the preference value to verify it was set.
-	 */
-	public void testPluginSetPreferences() {
-		IEclipsePreferences node = new InstanceScope().getNode(JSPCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		pluginSetPreferenceBoolean(node, JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
-	}
-
-	private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
-		boolean originalValue = false;
-		boolean expectedValue = true;
-
-		String originalString = node.get(prefKey, "bogus");
-		if (!"bogus".equals(originalString)) {
-			originalValue = Boolean.valueOf(originalString).booleanValue();
-			expectedValue = !originalValue;
-		}
-		node.putBoolean(prefKey, expectedValue);
-		boolean foundValue = node.getBoolean(prefKey, true);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		if ("bogus".equals(originalString))
-			node.remove(prefKey);
-		else
-			node.put(prefKey, originalString);
-	}
-
-	/**
-	 * Tests line delimiter preferences by making sure document created
-	 * follows line delimiter preference.
-	 */
-	public void testDelimiterPreferences() {
-		// check if content type preferences match
-		String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForJSP.ContentTypeID_JSP);
-		Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForJSP.ContentTypeID_JSP);
-		String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
-		assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
-		// set a particular line delimiter
-		prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
-		// create document
-		JSPDocumentLoader loader = new JSPDocumentLoader();
-		IEncodedDocument document = loader.createNewStructuredDocument();
-		String documentDelimiter = document.getPreferredLineDelimiter();
-
-		// verify delimiter in document matches preference
-		assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
-		// return to original preference
-		prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
deleted file mode 100644
index 18e9eafa3..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
+++ /dev/null
@@ -1,57 +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.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestContentTypeHandlers;
-import org.eclipse.jst.jsp.core.tests.contenttypeidentifier.contentspecific.TestModelHandlers;
-import org.eclipse.jst.jsp.core.tests.dom.TestImportedNodes;
-import org.eclipse.jst.jsp.core.tests.model.TestModelIncludes;
-import org.eclipse.jst.jsp.core.tests.model.TestModelRelease;
-import org.eclipse.jst.jsp.core.tests.model.TestModelWithNoFile;
-import org.eclipse.jst.jsp.core.tests.source.JSPTokenizerTest;
-import org.eclipse.jst.jsp.core.tests.taglibindex.TestIndex;
-import org.eclipse.jst.jsp.core.tests.translation.JSPJavaTranslatorCoreTest;
-import org.eclipse.jst.jsp.core.tests.validation.JSPJavaValidatorTest;
-import org.eclipse.jst.jsp.css.core.tests.source.JSPedCSSSourceParserTest;
-
-
-
-public class JSPCoreTestSuite extends TestSuite {
-	public static Test suite() {
-		return new JSPCoreTestSuite();
-	}
-
-	public JSPCoreTestSuite() {
-		super("SSE JSP Core Test Suite");
-
-		addTest(TestCeanupFormat.suite());
-		addTest(ModelCloneSuite.suite());
-		addTest(new TestSuite(TestModelHandlers.class, "TestModelHandlers"));
-		addTest(new TestSuite(TestContentTypeHandlers.class, "TestContentTypeHandlers"));
-		addTest(new TestSuite(TestModelManager.class, "TestModelManager"));
-		addTest(new TestSuite(FormatTester.class, "FormatTester"));
-		addTest(new TestSuite(TestModelRelease.class, "JSP Model Tests"));
-		addTest(new TestSuite(TestModelWithNoFile.class, "JSP Model Tests"));
-		addTest(new TestSuite(TestIndex.class, "TaglibIndex Tests"));
-		addTest(new TestSuite(JSPTokenizerTest.class, "Special Parsing Tests"));
-		addTest(new TestSuite(JSPJavaTranslatorCoreTest.class));
-		addTest(new TestSuite(TestModelIncludes.class));
-		addTest(new TestSuite(JSPCorePreferencesTest.class));
-		addTest(new TestSuite(JSPedCSSSourceParserTest.class, "Special Parsing Tests for JSP-CSS content"));
-		addTest(new TestSuite(JSPJavaValidatorTest.class, "JSP Java Validator Tests"));
-		addTest(new TestSuite(TestImportedNodes.class, "Imported Nodes Tests"));
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
deleted file mode 100644
index bf5b3b7d1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestsPlugin.java
+++ /dev/null
@@ -1,96 +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.jst.jsp.core.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.MissingResourceException;
-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 JSPCoreTestsPlugin extends Plugin {
-	//The shared instance.
-	private static JSPCoreTestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public JSPCoreTestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.jsp.core.tests.TestsPluginResources");
-		}
-		catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static JSPCoreTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = JSPCoreTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-
-	public static URL getInstallLocation() {
-		URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.core.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;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
deleted file mode 100644
index a641e1836..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/Logger.java
+++ /dev/null
@@ -1,143 +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.jst.jsp.core.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static Plugin fPlugin = JSPCoreTestsPlugin.getDefault();
-	private static Bundle fBundle = fPlugin.getBundle();
-	private static final String fPluginId = fBundle.getSymbolicName();
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * Adds message to log.
-	 * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message text to add to the log
-	 * @param exception exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, fPluginId, severity, message, exception);
-		fPlugin.getLog().log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * @param message text to print
-	 * @param category category of the message, to be compared with /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, fPluginId, IStatus.OK, message, exception);
-			fPlugin.getLog().log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the plugin for this logger is debugging
-	 */
-	public static boolean isDebugging() {
-		return fPlugin.isDebugging();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(fPluginId + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java
deleted file mode 100644
index bbf2cb1e9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/ModelCloneSuite.java
+++ /dev/null
@@ -1,26 +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.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class ModelCloneSuite extends TestSuite {
-	public static Test suite() {
-		return new ModelCloneSuite();
-	}
-
-	public ModelCloneSuite() {
-		super("ModelCloneSuite");
-
-		addTest(new TestSuite(TestStructuredDocumentClone.class, "TestStructuredDocumentClone"));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
deleted file mode 100644
index 95013a604..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/NullInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullInputStream extends InputStream {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#mark(int)
-	 */
-	public synchronized void mark(int readlimit) {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#markSupported()
-	 */
-	public boolean markSupported() {
-		// we can mark nothing.
-		// and, we are using this Null class specifically for
-		// a "fake" resettable stream.
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#read()
-	 */
-	public int read() throws IOException {
-
-		return -1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#reset()
-	 */
-	public synchronized void reset() throws IOException {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#skip(long)
-	 */
-	public long skip(long n) throws IOException {
-		return 0;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java
deleted file mode 100644
index a6e671f3d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestCeanupFormat.java
+++ /dev/null
@@ -1,31 +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.jst.jsp.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.core.tests.cleanupformat.CleanupTester;
-import org.eclipse.jst.jsp.core.tests.cleanupformat.FormatTester;
-
-
-public class TestCeanupFormat extends TestSuite {
-	public static Test suite() {
-		return new TestCeanupFormat();
-	}
-
-	public TestCeanupFormat() {
-		super("TestCeanupFormat");
-
-		addTest(new TestSuite(CleanupTester.class, "CleanupTester"));
-		addTest(new TestSuite(FormatTester.class, "FormatTester"));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
deleted file mode 100644
index 0e72b76a6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestModelManager.java
+++ /dev/null
@@ -1,70 +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.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-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;
-
-/**
- * This class tests basic creation of IModelManager plugin and the
- * ModelManger.
- * 
- * Appropriate for BVT.
- */
-public class TestModelManager extends TestCase {
-
-	/**
-	 * Constructor for TestModelManager.
-	 * 
-	 * @param name
-	 */
-	public TestModelManager(String name) {
-		super(name);
-	}
-
-	public void testModelManager() throws IOException {
-		IStructuredModel model = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		assertTrue("modelManager must not be null", modelManager != null);
-
-		try {
-			model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
-			assertTrue("basic XML empty model could not be created", model != null);
-		} finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-
-	}
-
-	public void testNullArgument() throws UnsupportedEncodingException, IOException {
-		IStructuredModel model = null;
-		Exception e = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		try {
-			model = modelManager.getModelForEdit((String) null, null, null);
-		} catch (IllegalArgumentException exception) {
-			e = exception;
-			assertTrue("illegal argument failed to throw IllegalArgumentException", e instanceof IllegalArgumentException);
-		} finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
deleted file mode 100644
index b45933eb5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/TestStructuredDocumentClone.java
+++ /dev/null
@@ -1,113 +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.jst.jsp.core.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class TestStructuredDocumentClone extends TestCase {
-
-	/**
-	 * Constructor for TestModelClone.
-	 */
-	public TestStructuredDocumentClone(String name) {
-		super(name);
-	}
-
-	public static Test getTest() {
-		return new TestStructuredDocumentClone("testCloneStructuredModelJSPXML");
-	}
-
-	public void testCloneStructuredDocumentXML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.xml", (InputStream) null, null);
-		assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
-		IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
-		// make sure the critical variables are NOT identical, but that new instances 
-		// have been made
-		boolean passed = true;
-		if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
-			passed = false;
-		if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
-			passed = false;
-		if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
-			passed = false;
-		assertTrue("newInstance of XML structuredDocument is not correct", passed);
-
-	}
-
-	/**
-	 * This test is most useful to check breakpoints and dig deep in object 
-	 * to check clones values
-	 */
-	public void testCloneStructuredDocumentJSP() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", (InputStream) null, null);
-		assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
-		IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
-		// make sure the critical variables are NOT identical, but that new instances 
-		// have been made
-		boolean passed = true;
-		if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
-			passed = false;
-		if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
-			passed = false;
-		if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
-			passed = false;
-		assertTrue("newInstance of JSP structuredDocument is not correct", passed);
-
-	}
-
-	/**
-	 * This test is most useful to check breakpoints and dig deep in object 
-	 * to check clones values
-	 */
-	public void testCloneStructuredDocumentJSPXML() throws IOException {
-		// First make (empty) structuredDocument
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		String testContent = "<@! page contentType=\"text/xml\" @>";
-		IStructuredDocument structuredDocument = modelManager.createStructuredDocumentFor("dummy.jsp", testContent, null);
-		assertTrue("structuredDocument could not be created!", structuredDocument != null);
-
-		IStructuredDocument clonedStructuredDocument = structuredDocument.newInstance();
-		// make sure the critical variables are NOT identical, but that new instances 
-		// have been made
-		boolean passed = true;
-		if (clonedStructuredDocument.getEncodingMemento() == structuredDocument.getEncodingMemento())
-			passed = false;
-		if (clonedStructuredDocument.getParser() == structuredDocument.getParser())
-			passed = false;
-		if (clonedStructuredDocument.getReParser() == structuredDocument.getReParser())
-			passed = false;
-		assertTrue("newInstance of JSPXML structuredDocument is not correct", passed);
-
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
deleted file mode 100644
index eda064388..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/CleanupTester.java
+++ /dev/null
@@ -1,341 +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.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.cleanup.HTMLCleanupProcessorImpl;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.cleanup.AbstractStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
-
-public class CleanupTester extends TestCase {
-	private static final boolean PRINT_FAILED_FORMAT_TESTS = false;
-	protected IModelManager fModelManager = null;
-	protected CleanupProcessorXML fCleanupProcessor = null;
-	protected HTMLCleanupProcessorImpl fHTMLCleanupProcessor = null;
-
-	public CleanupTester(String name) {
-		super(name);
-		// get model manager
-		fModelManager = StructuredModelManager.getModelManager();
-
-		// get cleanup processor
-		fCleanupProcessor = new CleanupProcessorXML();
-
-		// get HTML cleanup processor
-		fHTMLCleanupProcessor = new HTMLCleanupProcessorImpl();
-	}
-
-	public void testCleanupInsertTagsQuoteAttrs() throws UnsupportedEncodingException, IOException {
-		// get model
-		IStructuredModel structuredModel = getModel("invoice.xml");
-
-		// use for debugging
-//		String precleaned = structuredModel.getStructuredDocument().get();
-
-		// init CleanupPreferences
-		IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
-		cleanupPreferences.setCompressEmptyElementTags(false);
-		cleanupPreferences.setInsertRequiredAttrs(false);
-		cleanupPreferences.setInsertMissingTags(true);
-		cleanupPreferences.setQuoteAttrValues(true);
-		cleanupPreferences.setFormatSource(false);
-		cleanupPreferences.setConvertEOLCodes(false);
-
-		// cleanup
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
-		fCleanupProcessor.cleanupModel(structuredModel);
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
-		// compare
-		String cleaned = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "invoice.afterCleanupInsertTagsQuoteAttrs.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, cleaned);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testCleanupInsertTags() throws IOException, IOException {
-		// get model
-		IStructuredModel structuredModel = getModel("invoice.xml");
-
-		// init CleanupPreferences
-		IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
-		cleanupPreferences.setCompressEmptyElementTags(false);
-		cleanupPreferences.setInsertRequiredAttrs(false);
-		cleanupPreferences.setInsertMissingTags(true);
-		cleanupPreferences.setQuoteAttrValues(false);
-		cleanupPreferences.setFormatSource(false);
-		cleanupPreferences.setConvertEOLCodes(false);
-
-		// cleanup
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
-		fCleanupProcessor.cleanupModel(structuredModel);
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
-		// compare
-		String cleaned = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "invoice.afterCleanupInsertTags.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, cleaned);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testCleanupCompressEmptyElementTags() throws UnsupportedEncodingException, IOException {
-		// get model
-		IStructuredModel structuredModel = getModel("small.xml");
-
-		// init CleanupPreferences
-		IStructuredCleanupPreferences cleanupPreferences = fCleanupProcessor.getCleanupPreferences();
-		cleanupPreferences.setCompressEmptyElementTags(true);
-		cleanupPreferences.setInsertRequiredAttrs(false);
-		cleanupPreferences.setInsertMissingTags(false);
-		cleanupPreferences.setQuoteAttrValues(false);
-		cleanupPreferences.setFormatSource(true);
-		cleanupPreferences.setConvertEOLCodes(false);
-
-		// cleanup
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = false;
-		fCleanupProcessor.cleanupModel(structuredModel);
-		((AbstractStructuredCleanupProcessor) fCleanupProcessor).refreshCleanupPreferences = true;
-
-		// compare
-		String cleaned = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "small.afterCompressEmptyElementTags.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, cleaned);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testCleanupHTML() throws UnsupportedEncodingException, IOException {
-		// get model
-		IStructuredModel structuredModel = getModel("cleanup.html");
-
-		// init CleanupPreferences
-		IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-		cleanupPreferences.setTagNameCase(HTMLCorePreferenceNames.UPPER);
-		cleanupPreferences.setAttrNameCase(HTMLCorePreferenceNames.LOWER);
-		cleanupPreferences.setCompressEmptyElementTags(false);
-		cleanupPreferences.setInsertRequiredAttrs(false);
-		cleanupPreferences.setInsertMissingTags(true);
-		cleanupPreferences.setQuoteAttrValues(true);
-		cleanupPreferences.setFormatSource(false);
-		cleanupPreferences.setConvertEOLCodes(false);
-
-		// cleanup
-		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-		fHTMLCleanupProcessor.cleanupModel(structuredModel);
-		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
-		// compare
-		String cleaned = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "cleanup.afterCleanup.html";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, cleaned);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testCleanupHTMLtwice() throws UnsupportedEncodingException, IOException {
-		// get model
-		IStructuredModel structuredModel = getModel("cleanup.afterCleanup.html");
-
-		// init CleanupPreferences
-		IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-		cleanupPreferences.setTagNameCase(HTMLCorePreferenceNames.UPPER);
-		cleanupPreferences.setAttrNameCase(HTMLCorePreferenceNames.LOWER);
-		cleanupPreferences.setCompressEmptyElementTags(false);
-		cleanupPreferences.setInsertRequiredAttrs(false);
-		cleanupPreferences.setInsertMissingTags(true);
-		cleanupPreferences.setQuoteAttrValues(true);
-		cleanupPreferences.setFormatSource(false);
-		cleanupPreferences.setConvertEOLCodes(false);
-
-		// cleanup
-		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-		fHTMLCleanupProcessor.cleanupModel(structuredModel);
-		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-
-		// compare
-		String cleaned = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "cleanup.afterCleanup.html";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, cleaned);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-//	public void testCleanupJSPEmptyTags1() throws UnsupportedEncodingException, IOException {
-//		// get model
-//		IStructuredModel structuredModel = getModel("login.jsp");
-//
-//		// init CleanupPreferences
-//		IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-//		cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
-//		cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
-//		cleanupPreferences.setCompressEmptyElementTags(false);
-//		cleanupPreferences.setInsertRequiredAttrs(false);
-//		cleanupPreferences.setInsertMissingTags(true);
-//		cleanupPreferences.setQuoteAttrValues(true);
-//		cleanupPreferences.setFormatSource(true);
-//		cleanupPreferences.setConvertEOLCodes(false);
-//
-//		// cleanup
-//		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-//		fHTMLCleanupProcessor.cleanupModel(structuredModel);
-//		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-//
-//		// compare
-//		String cleaned = structuredModel.getStructuredDocument().get();
-//		String expectedFileName = "login.afterCleanup.jsp";
-//		String expected = getFile(expectedFileName);
-//		compare(expectedFileName, expected, cleaned);
-//
-//		// release model
-//		structuredModel.releaseFromRead();
-//	}
-//
-//	public void testCleanupJSPEmptyTags2() throws UnsupportedEncodingException, IOException {
-//		// get model
-//		IStructuredModel structuredModel = getModel("subscription.jsp");
-//
-//		// init CleanupPreferences
-//		IStructuredCleanupPreferences cleanupPreferences = fHTMLCleanupProcessor.getCleanupPreferences();
-//		cleanupPreferences.setTagNameCase(CommonModelPreferenceNames.UPPER);
-//		cleanupPreferences.setAttrNameCase(CommonModelPreferenceNames.LOWER);
-//		cleanupPreferences.setCompressEmptyElementTags(false);
-//		cleanupPreferences.setInsertRequiredAttrs(false);
-//		cleanupPreferences.setInsertMissingTags(true);
-//		cleanupPreferences.setQuoteAttrValues(true);
-//		cleanupPreferences.setFormatSource(true);
-//		cleanupPreferences.setConvertEOLCodes(false);
-//
-//		// cleanup
-//		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = false;
-//		fHTMLCleanupProcessor.cleanupModel(structuredModel);
-//		((AbstractStructuredCleanupProcessor) fHTMLCleanupProcessor).refreshCleanupPreferences = true;
-//
-//		// compare
-//		String cleaned = structuredModel.getStructuredDocument().get();
-//		String expectedFileName = "subscription.afterCleanup.jsp";
-//		String expected = getFile(expectedFileName);
-//		compare(expectedFileName, expected, cleaned);
-//
-//		// release model
-//		structuredModel.releaseFromRead();
-//	}
-
-	protected String readFile(String fileName) throws IOException {
-		String inputString = null;
-		InputStream fileInputStream = null;
-
-		try {
-			fileInputStream = getClass().getResourceAsStream(fileName);
-
-			byte[] inputBuffer = new byte[2048];
-			inputString = new String();
-			int bytesRead = -1;
-
-			while (true) {
-				bytesRead = fileInputStream.read(inputBuffer);
-				if (bytesRead == -1)
-					break;
-				String bufferString = new String(inputBuffer, 0, bytesRead);
-				//bufferString = bufferString.substring(0, bytesRead);
-				inputString = inputString.concat(bufferString);
-			}
-		}
-		finally {
-			if (fileInputStream != null)
-				fileInputStream.close();
-		}
-
-		return inputString;
-	}
-
-	protected static void printException(Exception exception) {
-		exception.printStackTrace();
-	}
-
-	protected IStructuredModel getModel(String fileName) throws UnsupportedEncodingException, IOException {
-		IStructuredModel structuredModel = null;
-		InputStream inputStream = null;
-
-		try {
-			String input = getFile(fileName);
-			inputStream = new ByteArrayInputStream(input.getBytes("UTF-8"));
-			String id = inputStream.toString().concat(fileName);
-			structuredModel = fModelManager.getModelForRead(id, inputStream, null);
-		}
-		// since in test code, no need to catch this
-		//		catch (Exception exception) {
-		//			Logger.logException(exception);
-		//		}
-		finally {
-			try {
-				inputStream.close();
-			}
-			catch (Exception exception) {
-				// hopeless
-			}
-		}
-
-		return structuredModel;
-	}
-
-	protected String getFile(String fileName) throws IOException {
-		return readFile("testfiles/".concat(fileName));
-	}
-
-	protected void compare(String testcaseName, String expected, String cleaned) {
-		if (cleaned.compareTo(expected) != 0) {
-			if (PRINT_FAILED_FORMAT_TESTS) {
-				System.out.println();
-				System.out.println(testcaseName + " failed");
-				System.out.println("========== expected file ==========");
-				System.out.println(expected);
-				System.out.println("========== cleaned file ==========");
-				System.out.println(cleaned);
-				System.out.println("========== expected file ==========");
-				String expectedString = StringUtils.replace(expected, "\r", "\\r");
-				expectedString = StringUtils.replace(expectedString, "\n", "\\n");
-				expectedString = StringUtils.replace(expectedString, "\t", "\\t");
-				System.out.println(expectedString);
-				System.out.println("========== cleaned file ==========");
-				String cleanedString = StringUtils.replace(cleaned, "\r", "\\r");
-				cleanedString = StringUtils.replace(cleanedString, "\n", "\\n");
-				cleanedString = StringUtils.replace(cleanedString, "\t", "\\t");
-				System.out.println(cleanedString);
-				System.out.println("=======================================");
-			}
-			assertTrue(false);
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
deleted file mode 100644
index fbdb6e24f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/FormatTester.java
+++ /dev/null
@@ -1,577 +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.jst.jsp.core.tests.cleanupformat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.format.HTMLFormatProcessorImpl;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.format.AbstractStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.core.internal.provisional.format.IStructuredFormatPreferencesXML;
-
-public class FormatTester extends TestCase {
-	private static final boolean PRINT_FAILED_FORMAT_TESTS = false;
-	protected IModelManager fModelManager = null;
-	protected FormatProcessorXML fFormatProcessor = null;
-	protected HTMLFormatProcessorImpl fHTMLFormatProcessor = null;
-
-	public FormatTester(String name) {
-		super(name);
-
-		// get model manager
-		fModelManager = StructuredModelManager.getModelManager();
-
-		// get format processor
-		fFormatProcessor = new FormatProcessorXML();
-
-		// get HTML format processor
-		fHTMLFormatProcessor = new HTMLFormatProcessorImpl();
-	}
-
-	public void testFormat261968() {
-		// get model
-		IStructuredModel structuredModel = getModel("261968.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "261968.afterDefaultFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatTagOpen() {
-		// get model
-		IStructuredModel structuredModel = getModel("tagOpen.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "tagOpen.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatTagOpenTagClose() {
-		// get model
-		IStructuredModel structuredModel = getModel("tagOpenTagClose.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "tagOpenTagClose.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatTags() {
-		// get model
-		IStructuredModel structuredModel = getModel("tags.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "tags.afterDefaultFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatEmpty() {
-		// get model
-		IStructuredModel structuredModel = getModel("empty.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "empty.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatOneSpace() {
-		// get model
-		IStructuredModel structuredModel = getModel("oneSpace.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "empty.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatOneChar() {
-		// get model
-		IStructuredModel structuredModel = getModel("oneChar.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "oneChar.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatSpaces() {
-		// get model
-		IStructuredModel structuredModel = getModel("spaces.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "empty.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatChars() {
-		// get model
-		IStructuredModel structuredModel = getModel("chars.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "chars.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatSpacesAndChars() {
-		// get model
-		IStructuredModel structuredModel = getModel("spacesAndChars.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "chars.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormat() {
-		// get model
-		IStructuredModel structuredModel = getModel("small.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "small.afterDefaultFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatSplitLinesSplitMultiAttrs() {
-		// get model
-		IStructuredModel structuredModel = getModel("small.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
-		formatPreferences.setLineWidth(72);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "small.afterSplitLinesSplitMultiAttrsFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatSplitLines() {
-		// get model
-		IStructuredModel structuredModel = getModel("small.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(72);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "small.afterSplitLinesFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatBlockComments() {
-		// get model
-		IStructuredModel structuredModel = getModel("blockComments.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "blockComments.afterDefaultFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatInlineComments() {
-		// get model
-		IStructuredModel structuredModel = getModel("inlineComments.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(999);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "inlineComments.afterDefaultFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testFormatInlineCommentsSplitLinesSplitMultiAttrs() {
-		// get model
-		IStructuredModel structuredModel = getModel("inlineComments.xml");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(true);
-		formatPreferences.setLineWidth(72);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = false;
-		fFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	public void testHTMLFormat() {
-		// get model
-		IStructuredModel structuredModel = getModel("HitCounterIntro.html");
-
-		// init FormatPreferences
-		IStructuredFormatPreferences formatPreferences = fHTMLFormatProcessor.getFormatPreferences();
-		((IStructuredFormatPreferencesXML) formatPreferences).setSplitMultiAttrs(false);
-		formatPreferences.setLineWidth(72);
-		formatPreferences.setIndent("\t");
-		formatPreferences.setClearAllBlankLines(false);
-
-		// format
-		((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = false;
-		fHTMLFormatProcessor.formatModel(structuredModel);
-		((AbstractStructuredFormatProcessor) fHTMLFormatProcessor).refreshFormatPreferences = true;
-
-		// compare
-		String formatted = structuredModel.getStructuredDocument().get();
-		String expectedFileName = "HitCounterIntro.afterDefaultFormat.html";
-		String expected = getFile(expectedFileName);
-		compare(expectedFileName, expected, formatted);
-
-		// release model
-		structuredModel.releaseFromRead();
-	}
-
-	protected String readFile(String fileName) {
-		String inputString = null;
-		InputStream fileInputStream = null;
-
-		try {
-			fileInputStream = getClass().getResourceAsStream(fileName);
-
-			byte[] inputBuffer = new byte[1024];
-			inputString = new String();
-			int bytesRead = -1;
-
-			while (true) {
-				bytesRead = fileInputStream.read(inputBuffer);
-				if (bytesRead == -1)
-					break;
-				String bufferString = new String(inputBuffer);
-				bufferString = bufferString.substring(0, bytesRead);
-				inputString = inputString.concat(bufferString);
-			}
-
-			if (fileInputStream != null)
-				fileInputStream.close();
-		}
-		catch (IOException exception) {
-			printException(exception);
-		}
-
-		return inputString;
-	}
-
-	protected static void printException(Exception exception) {
-		exception.printStackTrace();
-	}
-
-	protected IStructuredModel getModel(String fileName) {
-		IStructuredModel structuredModel = null;
-		InputStream inputStream = null;
-
-		try {
-			String input = getFile(fileName);
-			inputStream = new ByteArrayInputStream(input.getBytes("UTF8"));
-			String id = inputStream.toString().concat(fileName);
-			structuredModel = fModelManager.getModelForRead(id, inputStream, null);
-		}
-		catch (Exception exception) {
-			exception.printStackTrace();
-		}
-		finally {
-			try {
-				inputStream.close();
-			}
-			catch (Exception exception) {
-				// hopeless
-			}
-		}
-
-		return structuredModel;
-	}
-
-	protected String getFile(String fileName) {
-		return readFile("testfiles/".concat(fileName));
-	}
-
-	protected void compare(String testcaseName, String expected, String formatted) {
-		if (formatted.compareTo(expected) != 0) {
-			if (PRINT_FAILED_FORMAT_TESTS) {
-				System.out.println();
-				System.out.println(testcaseName + " failed");
-				System.out.println("========== expected file ==========");
-				System.out.println(expected);
-				System.out.println("========== formatted file ==========");
-				System.out.println(formatted);
-				System.out.println("========== expected file ==========");
-				String expectedString = StringUtils.replace(expected, "\r", "\\r");
-				expectedString = StringUtils.replace(expectedString, "\n", "\\n");
-				expectedString = StringUtils.replace(expectedString, "\t", "\\t");
-				System.out.println(expectedString);
-				System.out.println("========== formatted file ==========");
-				String formattedString = StringUtils.replace(formatted, "\r", "\\r");
-				formattedString = StringUtils.replace(formattedString, "\n", "\\n");
-				formattedString = StringUtils.replace(formattedString, "\t", "\\t");
-				System.out.println(formattedString);
-				System.out.println("=======================================");
-			}
-			assertTrue(false);
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
deleted file mode 100644
index 048388219..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.afterDefaultFormat.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<tag>
-	<t1></t1>
-	<t2></t2
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2>
-		/t2>
-		<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	t2>
-	</t2>
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2</t2>
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2</t2
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2</t2>
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2</t2>
-	<t3></t3>
-</tag>
-<tag>
-	<t1></t1>
-	<t2</t2>
-	t3>
-	</t3>
-</tag>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
deleted file mode 100644
index b9981e9c0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/261968.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<tag>
-       <t1></t1>
-       <t2></t2
-       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2>/t2>
-       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       t2></t2>
-       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2</t2>
-       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2</t2       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2</t2      >       <t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2</t2      ><t3></t3>
-</tag>
-<tag>
-       <t1></t1>
-       <t2</t2      >t3></t3>
-</tag>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
deleted file mode 100644
index cbace4dac..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.afterDefaultFormat.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name="myForm" method="post"
-	action="../Controllers/SampleController">
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
-	<TBODY>
-		<TR>
-			<TD colspan="2"><IMG src="../images/clearPixel.gif" width="1"
-				height="25" alt=""></TD>
-		</TR>
-		<TR>
-			<TD rowspan="2" align="LEFT" width="220" height="300"><IMG
-				src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
-			<TD align="LEFT" width="380">
-			<P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
-			</TD>
-		</TR>
-		<TR>
-			<TD align="LEFT" valign="TOP">
-			<P><FONT size="-1">This sample shows you how to use a Java
-			servlet to count how many times a page was visited.</FONT></P>
-			<P><FONT size="-1">This sample requires a database to
-			store the counter. If you have not already installed and configured
-			your database for the WebSphere samples, refer to <A
-				href="../Configuration/DBConfig.html">Database Configuration</A> for
-			instructions. </FONT></P>
-			<P><FONT size="-1"><A
-				href="javascript:document.myForm.submit()" target="_self"> <B>Run
-			this sample</B></A> </FONT></P>
-			<INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT
-				name="db_region" type="hidden" value="true" /></TD>
-		</TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
-	<TBODY>
-		<TR>
-			<TD align="CENTER">
-			<P><B><FONT size="-1">How this sample works:</FONT>
-			</TD>
-		</TR>
-		<TR>
-			<TD>
-			<TABLE border="0" width="100%">
-				<TBODY>
-					<TR>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG
-							src="../images/clearPixel.gif" width="15" height="1" alt="">
-						<!-- ########################################### --></TD>
-						<TD>
-						<P><FONT size="-1">This sample has:</FONT></P>
-						<UL>
-							<LI><FONT size="-1">A Java servlet that increments a
-							counter every time it is invoked </FONT>
-							<UL>
-								<LI><FONT size="-1">A Java Server Page (JSP) that
-								invokes the servlet and displays the counter </FONT>
-								<LI><FONT size="-1">A .servlet file that provides
-								information about the servlet to the WebSphere Application
-								Server </FONT>
-							</UL>
-						</UL>
-						<P><FONT size="-1">The Application Server processes
-						.jsp files with its JSP 1.0 processor servlet. It handles the
-						&lt;jsp:include ... /&gt; tag as a server-side include, replacing
-						the tag with the variable data generated by the servlet.</FONT></P>
-						</TD>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG
-							src="../images/clearPixel.gif" width="15" height="1" alt="">
-						<!-- ########################################### --></TD>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0"
-	cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0"
-	cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0"
-	width="500">
-	<TBODY>
-		<TR>
-			<TD align="CENTER">
-			<P><B><FONT size="-1"> How to use this sample on your
-			web page:</FONT></B></P>
-			</TD>
-		</TR>
-		<TR>
-			<TD>
-			<TABLE border="0" width="100%">
-				<TBODY>
-					<TR>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG
-							src="../images/clearPixel.gif" width="15" height="1" alt="">
-						<!-- ########################################### --></TD>
-						<TD>
-						<P><FONT size="-1">You can add this exact tag to any
-						HTML page you have on your site. Rename the HTML file with a .jsp
-						file extension, put the Java .class and .servlet files in the
-						classes folder, publish.... and you're ready to go.</FONT></P>
-						</TD>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG
-							src="../images/clearPixel.gif" width="15" height="1" alt="">
-						<!-- ########################################### --></TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
deleted file mode 100644
index cccca180a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/HitCounterIntro.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-		<HEAD>
-<META http-equiv
-=
-"Content-Type"
-content="text/html; charset=ISO-8859-1">
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Page Hit Counter Introduction</TITLE>
-<LINK rel="STYLESHEET" href="../theme/Master.css" type="text/css">
-</HEAD>
-<BODY>
-<CENTER>
-<FORM name   =   "myForm" method="post" action="../Controllers/SampleController">
-	<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
-	<TBODY>
-		<TR>
-			<TD colspan="2">
-			<IMG src="../images/clearPixel.gif" width="1" height="25" alt=""></TD>
-		</TR>
-		<TR>
-			<TD rowspan="2" align="LEFT" width="220" height="300"><IMG src="../images/hitCounter01.gif" width="200" height="300" alt=""></TD>
-			<TD align="LEFT" width="380">
-			<P><FONT size="+1"><B>Page Hit Counter Sample</B></FONT></P>
-			</TD>
-		</TR>
-		<TR>
-			<TD align="LEFT" valign="TOP">
-			<P><FONT size="-1">This sample shows you how to use a Java servlet to count how many times a page was visited.</FONT></P>
-			<P><FONT size="-1">This sample requires a database to store the counter. If you have not already installed and configured your database for the WebSphere samples, refer to <A href="../Configuration/DBConfig.html">Database Configuration</A> for instructions. </FONT></P>
-			<P><FONT size="-1"><A href="javascript:document.myForm.submit()" target="_self"> <B>Run this sample</B></A> </FONT></P>
-			<INPUT name="command" type="hidden" value="HitCounterView" /> <INPUT name="db_region" type="hidden" value="true" /></TD>
-		</TR>
-</TABLE>
-</FORM>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500">
-	<TBODY>
-		<TR>
-			<TD align="CENTER">
-			<P><B><FONT size="-1">How this sample works:</FONT>
-			</TD>
-		</TR>
-		<TR>
-			<TD>
-			<TABLE border="0" width="100%">
-				<TBODY>
-					<TR>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-						<TD>
-						<P><FONT size="-1">This sample has:</FONT></P>
-						<UL>
-							<LI><FONT size="-1">A Java servlet that increments a counter every time it is invoked </FONT>
-<UL>
-	<LI><FONT size="-1">A Java Server Page (JSP) that invokes the servlet and displays the counter </FONT>
-	<LI><FONT size="-1">A .servlet file that provides information about the servlet to the WebSphere Application Server </FONT>
-</UL>
-						</UL>
-						<P><FONT size="-1">The Application Server processes .jsp files with its JSP 1.0 processor servlet. It handles the &lt;jsp:include ... /&gt; tag as a server-side include, replacing the tag with the variable data generated by the servlet.</FONT></P>
-						</TD>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<BR>
-<TABLE border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500" border="0" cellpadding="0" cellspacing="0" width="500">
-	<TBODY>
-		<TR>
-			<TD align="CENTER">
-			<P><B><FONT size="-1">
-How to use this sample on your web page:</FONT></B></P>
-			</TD>
-		</TR>
-		<TR>
-			<TD>
-			<TABLE border="0" width="100%">
-				<TBODY>
-					<TR>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-						<TD>
-						<P><FONT size="-1">You can add this exact tag to any HTML page you have on your site. Rename the HTML file with a .jsp file extension, put the Java .class and .servlet files in the classes folder, publish.... and you're ready to go.</FONT></P>
-						</TD>
-						<TD><!-- ############ horizontal spacer ############ --> <IMG src="../images/clearPixel.gif" width="15" height="1" alt=""> <!-- ########################################### --></TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD>
-				</TR>
-					</TBODY>
-						</TABLE>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
deleted file mode 100644
index d7b841349..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- comment on a new line -->
-<menu date="11/30/2000"><!-- inline comment after tag -->
-	<rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
-	<!-- block comment
-		Black = #000000
-		Silver= #C0C0C0
-		Gray  = #808080
-		White = #FFFFFF
-	-->
-	<!-- block comment
-		Black = #000000
-		Silver= #C0C0C0
-		Gray  = #808080
-		White = #FFFFFF
-	-->
-	<item type="appetizer">
-		<desc>Warmed leek salad</desc><!-- inline comment after tag -->
-		<price units="usd">6.95<!-- inline comment after text --></price>
-		<price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-	</item>
-	<!-- comment on a new line -->
-	<!--   comment   on   a   new   line   -->
-	<!--comment on a new line with no space-->
-	<!--
-		No space
-	-->
-	<!--
-		OneSpace
-	-->
-	<!--
-		One tab
-	-->
-	<!--
-		This is a long paragraph.
-		
-		The text
-		in this paragraph should NOT be re-flowed.-->
-	<!--
-		This is a long paragraph.
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-	-->
-	<!--
-		This is a long paragraph.
-		
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-	-->
-	<!--
-		This is a long paragraph.
-		
-		
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-	-->
-	<!--
-		
-		This is a long paragraph.
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-	-->
-	<!--
-		
-		This is a long paragraph.
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-		
-	-->
-	<!--
-		
-		
-		
-		This is a long paragraph.
-		
-		
-		
-		The text
-		in this paragraph should NOT be re-flowed.
-		
-		
-		
-	-->
-	<item type="appetizer">
-		<!-- a
-			b-->
-		<!-- a
-			b -->
-		<!--
-			a
-			b-->
-		<!--
-			a
-			b -->
-		<!--
-			a
-			b
-		-->
-		<!-- a
-			b
-		-->
-		<!--
-			
-			
-			
-			a
-			
-			
-			
-			b
-			
-			
-			
-		-->
-		<desc>Prosciutto ham with melon</desc>
-		<!-- this block comment should line up with the sibilings
-			Black = #000000
-			Silver= #C0C0C0
-			Gray  = #808080
-			White = #FFFFFF
-		-->
-		<price units="usd">7.95</price>
-		<!-- comment before missing end tag -->
-</menu>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
deleted file mode 100644
index 296987833..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/blockComments.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-	<!-- comment on a new line -->
-		<menu date="11/30/2000"><!-- inline comment after tag -->
-	<rname>Liam's Chowder House and Grill</rname><!-- inline comment after tag -->
-	<!-- block comment
-		Black = #000000
-		Silver= #C0C0C0
-		Gray  = #808080
-		White = #FFFFFF
-	-->
-	<!-- block comment
-			Black = #000000
-		Silver= #C0C0C0
-				Gray  = #808080
-	White = #FFFFFF
--->
-	<item type="appetizer">
-		<desc>Warmed leek salad</desc><!-- inline comment after tag --><price units="usd">6.95<!-- inline comment after text --></price><price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-	</item>
-	<!-- comment on a new line -->
-	<!--   comment   on   a   new   line   -->
-	<!--comment on a new line with no space-->
-<!--
-No space
--->
-<!--
- OneSpace
--->
-<!--
-	One tab
--->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.-->
-<!--
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
--->
-<!--
-
-This is a long paragraph.
-
-The text
-in this paragraph should NOT be re-flowed.
-
--->
-<!--
-
-
-
-This is a long paragraph.
-
-
-
-The text
-in this paragraph should NOT be re-flowed.
-
-
-
--->
-	<item type="appetizer">
-<!-- a
-     b-->
-<!-- a
-     b -->
-<!--
-a
-     b-->
-<!--
-a
-     b -->
-<!--
-a
-     b
--->
-<!-- a
-     b
-      -->
-<!--
-
-
-
-a
-
-
-
-b
-
-
-
--->
-		<desc>Prosciutto ham with melon</desc>
-<!-- this block comment should line up with the sibilings
-	Black = #000000
-	Silver= #C0C0C0
-	Gray  = #808080
-	White = #FFFFFF
--->
-	<price units="usd">7.95</price>
-	<!-- comment before missing end tag -->
-</menu>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
deleted file mode 100644
index f2ba8f84a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/chars.xml
+++ /dev/null
@@ -1 +0,0 @@
-abc
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
deleted file mode 100644
index 847d8d7c6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.afterCleanup.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<HTML>
-<HEAD>
-   <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-   <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages.  Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c 
- </I></A> 
-
-<BR><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter:  </I> </A> 
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters.  For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion.  This guy was whipped up in Perl.
-<BR><BR>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes:  </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.  
-<BR><BR>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.  
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix.  It is written in good ol' C.
-
-<BR ><BR  >
-</LI><LI> 
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list.  This is written in Lisp, of all things.  There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.  
-It relies heavily on recursion, so it takes a different
-mindset to program in this language.  But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR   ><BR    >
-
-</LI><LI> 
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I>  This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program.  This works for any programming
-language as you can supply the comment character on the command line.  This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
-        an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.  
-Peruse (peruse, mind you.  I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c 
- </I></A> 
-<BR abc = "def"><BR abc  =  "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B> 
-A math class written in Java using Object Oriented design principles.  The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values.  Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" > 
-<I> RegressionCalc.java </I> </A>  This is the main class that does the
-calculations.  It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" > 
-<I> MathClass.java </I>  </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers.  This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" > 
-<I> Regression.java </I>  </A> This is basically the main routine, or where the
-program starts.  It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be:  <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)  
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC.  The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272 
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay.  Really.  If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk. 
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt"> 
-<I> Lost LILO?  Recover.</I>  </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO.  I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux.  Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL><BODY></BODY>
-</HTML><HTML>
-</HTML>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
deleted file mode 100644
index 0b97a0020..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/cleanup.html
+++ /dev/null
@@ -1,142 +0,0 @@
-<html>
-<HEAD>
-   <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-   <META name="GENERATOR" content="Mozilla/4.72 [en] (Windows NT 5.0; U) [Netscape]" />
-<TITLE></TITLE>
-</HEAD>
-
-This is a page of some of the technical stuff that I've written using various
-programming languages.  Click on the links to learn more about the projects or
-to see the source code.<BR>
-<I>Note: Feel free to copy, steal, modify, destroy what you will...</I><BR><BR>
-<HR>
-
-<H2> Programs and Utilities </H2>
-<UL>
-<LI><A href="makemake.html"> <I> Automatic
-Makefile Utility: </I></A> This generates a Makefile and updates it according
-to the files currently in your directory.
-Take a gander at the source here: <A
-href="makemake.c"> <I> makemake.c 
- </I></A> 
-
-<br><BR>
-</LI><LI><A href="mailsort.pl" > <I>
-mail file sorter:  </I> </A> 
-This utility parses a mail file and creates another mail file containing only
-the messages specified by paramaters.  For example, parse a mail archive file
-(old-mail-Jan-2000) and extract all of the messages from davek@yourmom.com or
-with the subject Marillion.  This guy was whipped up in Perl.
-<BR><br>
-
-</LI><LI><A href="electronicNotes.html" > <I>
-Electronic Notes:  </I> </A> This is an original idea (gasp!) that I developed which is a
-system for keeping little reminders to yourself during the day and having them
-sent to you all in one convenient file via email at the end of the day.  
-<br><br>
-
-</LI><LI><A href="header.html" > <I> C/C++ Header file
-to Implementation file converter: </I> </A>
-This is a very useful tool written in C++ that converts .h files to empty
-implementation (.C) files.  
-<BR><BR>
-</LI><LI><A href="matrix.html" > <I> Matrix Manipulation
-Package: </I></A> This is a package that does all sorts of cool manipulations
-with matrices, such as Gaussian Elimination, Normal Equations, Vandermonde
-Matrices, Cholesky Factorization, Error Analysis, and more stuff than you would
-ever want to do with a matrix.  It is written in good ol' C.
-
-<BR ><BR  >
-</LI><LI> 
-<A href="lisp.html" > <I>Set Operations: </I></A> <I></I> A program that performs set
-operations on a list.  This is written in Lisp, of all things.  There's also
-some examples of my own interpretations of some Lisp functions. Lisp is a good
-language for AI and things of that nature.  
-It relies heavily on recursion, so it takes a different
-mindset to program in this language.  But used correctly and for its intended
-purpose, Lisp is a very unique and powerful programming language.
-<BR   ><BR    >
-
-</LI><LI> 
-<A href="loc.html" > <I> Lines Of Code Counter:
-</I></A><I></I>  This is is LOC counter that I wrote in Perl that calculates the number of
-uncommented lines of code in a program.  This works for any programming
-language as you can supply the comment character on the command line.  This is
-an extremely useful program for use in software metrics.
-<BR abc="def"><BR abc="def" >
-
-</LI><LI><A href="linwin.html"> <I> Simple *nix to
-windows text converter </I></A> This takes files written in Linux (and in vi or
-        an editor with automatic line breaks after every 80 or so chars) and
-formats it so it will display properly in Windows environment should you be
-forced to do so.  
-Peruse (peruse, mind you.  I don't want to see any <I>browsing</I>) the source here: <A
-href="linwin.c"> <I> linwin.c 
- </I></A> 
-<BR abc = "def"><BR abc  =  "def">
-
-
-</LI><LI><B> Regression and Standard Deviation: </B> 
-A math class written in Java using Object Oriented design principles.  The main
-aspects of the program are for figuring out Standard Deviation and the
-Regression, when you input a set of x and y values.  Regression calculations
-are often used in Software Metrics to to help in estimating length of code, and
-time spent on the project.<BR>
-
-<A href="RegressionCalc.html" > 
-<I> RegressionCalc.java </I> </A>  This is the main class that does the
-calculations.  It calculates B1, B0, and r^2, which are all parameters of
-Regression.
-<BR abc= "def">
-<A href="MathClass.html" > 
-<I> MathClass.java </I>  </A> This is simply a small class which calculates the
-mean and the standard deviation of a vector of numbers.  This is used by the
-RegressionCalc class in its calculations.
-<BR abc ="def">
-<A href="Regression.html" > 
-<I> Regression.java </I>  </A> This is basically the main routine, or where the
-program starts.  It puts all of the input from the command line into two
-separate vectors for the x and y values.<BR><BR>
-
-An example of the usage of this program would be:  <BR>
-If you had a history of data on your estimated Lines Of Code (LOC) per class,
-as well as the actual LOC per class, you could put these in the formula and
-find out the Regression of the data (or how far away each point is from the
-function line.)  
-
-You would input the data for the estimated LOC, separated by a comma, and
-followed by the actual LOC.  The result would be the regression calculation.
-<PRE>
-%java Regression 130 650 99 150 , 186 699 132 272 
-
-X Data = [ 130.0 650.0 99.0 150.0 ]
-Y Data = [ 186.0 699.0 132.0 272.0 ]
-N = 4
-Beta0 = 72.6905030780361
-Beta1 = 0.9701049443030667
-rSquared = 2212.504697673689
-</PRE>
-
-</LI></UL>
-
-<HR>
-<H2> Knowledge </H2>
-<UL>
-<LI><A href="vim.html"> <I> Espousing my love
-for vim! </I></A> vim just rocks, okay.  Really.  If I had to choose between,
-like, sex, or using vim--let's just say I'd be one masterful-editing monk. 
-<BR><BR>
-
-
-</LI><LI>
-<A href="MBR-LILO.txt"> 
-<I> Lost LILO?  Recover.</I>  </A> If you have Linux installed in a multi-boot
-environment, and you overwrite your MBR, you can lose LILO.  I reinstalled
-Windows (hey, I needed to play Final Fantasy VIII!) and couldn't boot into
-Linux.  Here's how I recovered.
-<BR><BR>
-
-
-
-</LI></UL></body>
-<html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/empty.xml
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
deleted file mode 100644
index 9322d4bea..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterDefaultFormat.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<root>
-	<desc>Warmed leek salad</desc><!-- inline comment after tag -->
-	<desc>Warmed leek salad</desc><!-- inline comment after text -->
-	<price units="usd">6.95<!-- inline comment after text --></price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-	<price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->
-		dollars
-	</price>
-	<price units="usd" units="usd">
-		<number /><!-- inline comment after tag -->
-		<unit />
-	</price>
-	<price>
-		<number /><!-- inline comment after tag -->
-		<unit />
-	</price>
-	<price>
-		<number />
-		<!-- comment on a new line -->
-		<unit />
-	</price>
-	<price><!-- inline comment --></price>
-	<th>
-		<b>Fahrenheit<!-- testing --></b>
-	</th>
-</root>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index 7fddaf5e6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<root>
-	<desc>Warmed leek salad</desc><!-- inline comment after tag -->
-	<desc>Warmed leek salad</desc><!-- inline comment after text -->
-	<price units="usd">6.95<!-- inline comment after text --></price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price units="usd">
-		<number /><!-- inline comment after tag -->
-	</price>
-	<price
-		units="usd"
-		units="usd">
-		6.95<!-- inline comment after text -->
-	</price>
-	<price
-		units="usd"
-		units="usd">
-		6.95<!-- inline comment after text and followed by text -->
-		dollars
-	</price>
-	<price
-		units="usd"
-		units="usd">
-		<number /><!-- inline comment after tag -->
-		<unit />
-	</price>
-	<price>
-		<number /><!-- inline comment after tag -->
-		<unit />
-	</price>
-	<price>
-		<number />
-		<!-- comment on a new line -->
-		<unit />
-	</price>
-	<price><!-- inline comment --></price>
-	<th>
-		<b>Fahrenheit<!-- testing --></b>
-	</th>
-</root>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
deleted file mode 100644
index 71a11bcf4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/inlineComments.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<root><desc>Warmed leek salad</desc><!-- inline comment after tag -->
-<desc>Warmed leek salad</desc>   <!-- inline comment after text -->
-<price units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd"><number/><!-- inline comment after tag --></price>
-<price units="usd"><number/>   <!-- inline comment after tag --></price>
-<price units="usd">   <number/><!-- inline comment after tag --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text --></price>
-<price units="usd" units="usd">6.95<!-- inline comment after text and followed by text -->dollars</price>
-<price units="usd" units="usd"><number/><!-- inline comment after tag --><unit/></price>
-<price><number/><!-- inline comment after tag --><unit/></price>
-<price><number/>
-<!-- comment on a new line --><unit/></price>
-<price><!-- inline comment --></price>
-<th><b>Fahrenheit <!-- testing --></b></th>
-</root>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
deleted file mode 100644
index 012c982d9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTags.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
-  <Header invoiceNumber=12345>
-    <Date>
-      <Month>July</Month>
-      <Day>15</Day>
-      <Year>2001
-    </Year></Date>
-    <BillTo custNumber=/>
-    <BillTo custNumber=   />
-    <BillTo custNumber   =/>
-    <BillTo custNumber   =   />
-    <BillTo custNumber name=Craig    phone =     416-448-4414 />
-    <BillTo custNumber   =   X5739 name    phone =     416-448-4414 />
-    <BillTo custNumber   =   X5739 name   = Craig    phone/>
-    <BillTo custNumber name phone/>
-    <BillTo custNumber   =   X5739 name="Craig Salter" phone=416-448-4414>
-      <Address>
-        <street1>IBM</street1>
-        <street2>1150 Eglinton Ave East</street2>
-        <city>Toronto</city>
-        <state>Ontario</state>
-        <zip>M3C 1H7</zip>
-        <country>Canada
-  </country></Address></BillTo></Header>
-  <Item discount=promotion price=57>
-    <description>A wedding ring</description></Item></Invoice>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
deleted file mode 100644
index 557812da0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.afterCleanupInsertTagsQuoteAttrs.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
-  <Header invoiceNumber="12345">
-    <Date>
-      <Month>July</Month>
-      <Day>15</Day>
-      <Year>2001
-    </Year></Date>
-    <BillTo custNumber="custNumber"/>
-    <BillTo custNumber=   "custNumber"/>
-    <BillTo custNumber   ="custNumber"/>
-    <BillTo custNumber   =   "custNumber"/>
-    <BillTo custNumber="custNumber" name="Craig"    phone =     "416-448-4414" />
-    <BillTo custNumber   =   "X5739" name="name"    phone =     "416-448-4414" />
-    <BillTo custNumber   =   "X5739" name   = "Craig"    phone="phone"/>
-    <BillTo custNumber="custNumber" name="name" phone="phone"/>
-    <BillTo custNumber   =   "X5739" name="Craig Salter" phone="416-448-4414">
-      <Address>
-        <street1>IBM</street1>
-        <street2>1150 Eglinton Ave East</street2>
-        <city>Toronto</city>
-        <state>Ontario</state>
-        <zip>M3C 1H7</zip>
-        <country>Canada
-  </country></Address></BillTo></Header>
-  <Item discount="promotion" price="57">
-    <description>A wedding ring</description></Item></Invoice>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
deleted file mode 100644
index 88a26b59f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/invoice.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId" "Invoice.dtd" >
-<Invoice>
-  <Header invoiceNumber=12345>
-    <Date>
-      <Month>July</Month>
-      <Day>15</Day>
-      <Year>2001
-    </Date>
-    <BillTo custNumber=/>
-    <BillTo custNumber=   />
-    <BillTo custNumber   =/>
-    <BillTo custNumber   =   />
-    <BillTo custNumber name=Craig    phone =     416-448-4414 />
-    <BillTo custNumber   =   X5739 name    phone =     416-448-4414 />
-    <BillTo custNumber   =   X5739 name   = Craig    phone/>
-    <BillTo custNumber name phone/>
-    <BillTo custNumber   =   X5739 name="Craig Salter" phone=416-448-4414>
-      <Address>
-        <street1>IBM</street1>
-        <street2>1150 Eglinton Ave East</street2>
-        <city>Toronto</city>
-        <state>Ontario</state>
-        <zip>M3C 1H7</zip>
-        <country>Canada
-  </Header>
-  <Item discount=promotion price=57>
-    <description>A wedding ring
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
deleted file mode 100644
index 7e906c976..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.afterCleanup.jsp
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
-      function submitForm(dest){
-         document.myForm.action = dest
-         document.myForm.submit()
-      }
-      </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username &amp; password to connect to the database.<BR>
-This username &amp; password should be the one used while creating the
-database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<%  session.removeAttribute("error_message");
-      }  %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT
-	type="hidden" name="command"
-	value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden"
-	name="previous_page" value="Login/Login.jsp"> <A
-	href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
-	<TBODY>
-		<TR>
-			<TD><FONT color="#993333"> username: </FONT></TD>
-			<TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> password: </FONT></TD>
-			<TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> drivername: </FONT></TD>
-			<TD><INPUT name="driver" type="text" size="30" maxlength="40"
-				value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> url: </FONT></TD>
-			<TD><INPUT name="url" type="text" size="30" maxlength="40"
-				value="jdbc:db2:WSSAMPLE"></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
deleted file mode 100644
index 439a67bd8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/login.jsp
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<TITLE>Login</TITLE>
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-</HEAD>
-<BODY bgcolor="#ffffcc">
-<SCRIPT>
-      function submitForm(dest){
-         document.myForm.action = dest
-         document.myForm.submit()
-      }
-      </SCRIPT>
-<CENTER>
-<H1>Database Connectivity</H1>
-<HR>
-</CENTER>
-<P>Enter the username &amp; password to connect to the database.<BR>
-This username &amp; password should be the one used while creating the database.</P>
-<% if(session.getAttribute("error_message") != null) { %>
-<P>* Incorrect Login or Password</P>
-<%  session.removeAttribute("error_message");
-      }  %>
-<FORM name="myForm" method="POST" action="../Login/LogonServlet"><INPUT type="hidden" name="command" value='<%=session.getAttribute("final_page") %>'> <INPUT type="hidden" name="previous_page" value="Login/Login.jsp"> <A href="javascript:submitForm('../Login/LogonServlet')">OK</A>
-<TABLE border="0">
-	<TBODY>
-		<TR>
-			<TD><FONT color="#993333"> username: </FONT></TD>
-			<TD><INPUT name="userID" type="text" size="30" maxlength="40"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> password: </FONT></TD>
-			<TD><INPUT name="password" type="password" size="30" maxlength="40"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> drivername: </FONT></TD>
-			<TD><INPUT name="driver" type="text" size="30" maxlength="40" value="COM.ibm.db2.jdbc.app.DB2Driver"></TD>
-		</TR>
-		<TR>
-			<TD><FONT color="#993333"> url: </FONT></TD>
-			<TD><INPUT name="url" type="text" size="30" maxlength="40" value="jdbc:db2:WSSAMPLE"></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-</FORM>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
deleted file mode 100644
index 2e65efe2a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneChar.xml
+++ /dev/null
@@ -1 +0,0 @@
-a
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
deleted file mode 100644
index 0519ecba6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/oneSpace.xml
+++ /dev/null
@@ -1 +0,0 @@
- 
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
deleted file mode 100644
index bba9c7fd6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterCompressEmptyElementTags.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
-	<XMI.header>
-		<XMI.documentation>
-			<XMI.exporter>XMI Toolkit</XMI.exporter>
-
-			<XMI.exporterVersion>1.05</XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion />
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion />
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1" />
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.metamodel xmi.name="UML" xmi.version="1.1" />
-	</XMI.header>
-
-	<XMI.content>
-		<Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
-			<Foundation.Core.ModelElement.name>
-				ejb
-			</Foundation.Core.ModelElement.name>
-			<Foundation.Core.ModelElement.visibility xmi.value="public" />
-			<XMI.extension xmi.extender="IXT" xmi.extenderID="">
-				<ixts s="IDL">
-					<ixttv t="uuid"
-						v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
-				</ixts>
-				<ixts s="Rose">
-					<ixttv t="quid" v="3780E272032D" />
-					<ixttv t="is_unit" v="TRUE" />
-					<ixttv t="file_name"
-						v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
-					<ixttv t="is_loaded" v="TRUE" />
-				</ixts>
-				<ixts s="RosePetal">
-					<ixttv t="charSet" v="0" />
-					<ixttv t="version" v="43" />
-					<ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
-				</ixts>
-			</XMI.extension>
-		</Model_Management.Package>
-	</XMI.content>
-
-</XMI>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
deleted file mode 100644
index 4d66ba3c0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterDefaultFormat.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
-	<XMI.header>
-		<XMI.documentation>
-			<XMI.exporter>XMI Toolkit</XMI.exporter>
-
-			<XMI.exporterVersion>1.05</XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.metamodel xmi.name="UML" xmi.version="1.1" />
-	</XMI.header>
-
-	<XMI.content>
-		<Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
-			<Foundation.Core.ModelElement.name>ejb</Foundation.Core.ModelElement.name>
-			<Foundation.Core.ModelElement.visibility xmi.value="public" />
-			<XMI.extension xmi.extender="IXT" xmi.extenderID="">
-				<ixts s="IDL">
-					<ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
-				</ixts>
-				<ixts s="Rose">
-					<ixttv t="quid" v="3780E272032D" />
-					<ixttv t="is_unit" v="TRUE" />
-					<ixttv t="file_name" v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
-					<ixttv t="is_loaded" v="TRUE" />
-				</ixts>
-				<ixts s="RosePetal">
-					<ixttv t="charSet" v="0" />
-					<ixttv t="version" v="43" />
-					<ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
-				</ixts>
-			</XMI.extension>
-		</Model_Management.Package>
-	</XMI.content>
-
-</XMI>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
deleted file mode 100644
index a708f6e15..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesFormat.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
-	<XMI.header>
-		<XMI.documentation>
-			<XMI.exporter>XMI Toolkit</XMI.exporter>
-
-			<XMI.exporterVersion>1.05</XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1"></XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion xmi.name="UML" xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.metamodel xmi.name="UML" xmi.version="1.1" />
-	</XMI.header>
-
-	<XMI.content>
-		<Model_Management.Package xmi.id="_1" xmi.uuid="Name:ejb">
-			<Foundation.Core.ModelElement.name>
-				ejb
-			</Foundation.Core.ModelElement.name>
-			<Foundation.Core.ModelElement.visibility xmi.value="public" />
-			<XMI.extension xmi.extender="IXT" xmi.extenderID="">
-				<ixts s="IDL">
-					<ixttv t="uuid"
-						v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
-				</ixts>
-				<ixts s="Rose">
-					<ixttv t="quid" v="3780E272032D" />
-					<ixttv t="is_unit" v="TRUE" />
-					<ixttv t="file_name"
-						v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
-					<ixttv t="is_loaded" v="TRUE" />
-				</ixts>
-				<ixts s="RosePetal">
-					<ixttv t="charSet" v="0" />
-					<ixttv t="version" v="43" />
-					<ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" />
-				</ixts>
-			</XMI.extension>
-		</Model_Management.Package>
-	</XMI.content>
-
-</XMI>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
deleted file mode 100644
index ee5bbf2cc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.afterSplitLinesSplitMultiAttrsFormat.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI
-	xmi.version="1.0"
-	timestamp="Tue Nov 28 08:19:21 EST 2000">
-
-	<XMI.header>
-		<XMI.documentation>
-			<XMI.exporter>XMI Toolkit</XMI.exporter>
-
-			<XMI.exporterVersion>1.05</XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion>1.05</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion
-					xmi.name="UML"
-					xmi.version="1.1">
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion
-					xmi.name="UML"
-					xmi.version="1.1">
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion
-					xmi.name="UML"
-					xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.documentation>
-				<XMI.exporterVersion
-					xmi.name="UML"
-					xmi.version="1.1">
-					1.05
-				</XMI.exporterVersion>
-			</XMI.documentation>
-			<XMI.metamodel
-				xmi.name="UML"
-				xmi.version="1.1" />
-	</XMI.header>
-
-	<XMI.content>
-		<Model_Management.Package
-			xmi.id="_1"
-			xmi.uuid="Name:ejb">
-			<Foundation.Core.ModelElement.name>
-				ejb
-			</Foundation.Core.ModelElement.name>
-			<Foundation.Core.ModelElement.visibility xmi.value="public" />
-			<XMI.extension
-				xmi.extender="IXT"
-				xmi.extenderID="">
-				<ixts s="IDL">
-					<ixttv
-						t="uuid"
-						v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1" />
-				</ixts>
-				<ixts s="Rose">
-					<ixttv
-						t="quid"
-						v="3780E272032D" />
-					<ixttv
-						t="is_unit"
-						v="TRUE" />
-					<ixttv
-						t="file_name"
-						v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;" />
-					<ixttv
-						t="is_loaded"
-						v="TRUE" />
-				</ixts>
-				<ixts s="RosePetal">
-					<ixttv
-						t="charSet"
-						v="0" />
-					<ixttv
-						t="version"
-						v="43" />
-					<ixttv
-						t="_written"
-						v="&#34;Rose 6.5.9232.10&#34;" />
-				</ixts>
-			</XMI.extension>
-		</Model_Management.Package>
-	</XMI.content>
-
-</XMI>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
deleted file mode 100644
index 6295d5cc0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/small.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<XMI xmi.version="1.0" timestamp="Tue Nov 28 08:19:21 EST 2000">
-
-	<XMI.header>
-		<XMI.documentation>
-			<XMI.exporter>
-			XMI Toolkit
-			</XMI.exporter>
-			
-			<XMI.exporterVersion>    1.05    </XMI.exporterVersion>
-		</XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion></XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion></XMI.exporterVersion> </XMI.documentation>
-		<XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion>    1.05    </XMI.exporterVersion></XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion>    1.05    </XMI.exporterVersion> </XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion xmi.name =	"UML" xmi.version = "1.1"></XMI.exporterVersion></XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion xmi.name =	"UML" xmi.version = "1.1"></XMI.exporterVersion> </XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion xmi.name =	"UML" xmi.version = "1.1">    1.05    </XMI.exporterVersion></XMI.documentation>
-		<XMI.documentation>
-			<XMI.exporterVersion xmi.name =	"UML" xmi.version = "1.1">    1.05    </XMI.exporterVersion> </XMI.documentation>
-		<XMI.metamodel xmi.name    =			"UML" xmi.version
-		=
-		"1.1" />
-	</XMI.header>
-
-	<XMI.content>
-		<Model_Management.Package
-			xmi.id="_1"					xmi.uuid="Name:ejb">
-			<Foundation.Core.ModelElement.name>ejb    </Foundation.Core.ModelElement.name>
-			<Foundation.Core.ModelElement.visibility xmi.value="public"/>
-			<XMI.extension xmi.extender="IXT" xmi.extenderID="">
-				<ixts s="IDL">
-					<ixttv t="uuid" v="DCE:d8a25660-8826-11e1-0000-005d9e6adec4:1"
-					/>
-				</ixts>
-				<ixts s="Rose">
-					<ixttv
-						t="quid"
-						v="3780E272032D"
-						/>
-					<ixttv
-					t="is_unit"
-					v="TRUE"
-					/>
-					<ixttv t="file_name"
-						v="&#34;$ECLIPSE_RESOURCES\\eTools EJB libraries\\ejbschema.cat&#34;"
-									/>
-					<ixttv t="is_loaded" v="TRUE" />
-				</ixts>
-				<ixts s="RosePetal">
-					<ixttv t="charSet" v="0" />
-							<ixttv t="version" v="43" />
-	<ixttv t="_written" v="&#34;Rose 6.5.9232.10&#34;" /></ixts></XMI.extension>
-		</Model_Management.Package>
-	</XMI.content>
-
-</XMI>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
deleted file mode 100644
index 01ad2f9a6..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spaces.xml
+++ /dev/null
@@ -1 +0,0 @@
-   
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
deleted file mode 100644
index 9c04eb569..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/spacesAndChars.xml
+++ /dev/null
@@ -1 +0,0 @@
-   abc   
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
deleted file mode 100644
index 8c57fd0f8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.afterCleanup.jsp
+++ /dev/null
@@ -1,112 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java"%>
-<%@ taglib uri="/WEB-INF/app.tld" prefix="app"%>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
-<app:checkLogon />
-
-<%-- In real life, these would be loaded from a database --%>
-<%
-  java.util.ArrayList list = new java.util.ArrayList();
-  list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
-  list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
-  pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<HEAD>
-<logic:equal name="subscriptionForm" property="action" scope="request"
-	value="Create">
-	<TITLE><bean:message key="subscription.title.create" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
-	value="Delete">
-	<TITLE><bean:message key="subscription.title.delete" /></TITLE>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action" scope="request"
-	value="Edit">
-	<TITLE><bean:message key="subscription.title.edit" /></TITLE>
-</logic:equal>
-<html:base />
-</HEAD>
-<BODY bgcolor="white">
-
-<html:errors />
-
-<html:form action="/saveSubscription" focus="host">
-	<html:hidden property="action" />
-	<TABLE border="0" width="100%">
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.username" />:</TH>
-			<TD align="left"><bean:write name="user" property="username"
-				filter="true" /></TD>
-		</TR>
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.mailHostname" />:</TH>
-			<TD align="left"><logic:equal name="subscriptionForm"
-				property="action" scope="request" value="Create">
-				<html:text property="host" size="50" />
-			</logic:equal> <logic:notEqual name="subscriptionForm"
-				property="action" scope="request" value="Create">
-				<html:hidden property="host" write="true" />
-			</logic:notEqual></TD>
-		</TR>
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.mailUsername" />:</TH>
-			<TD align="left"><html:text property="username" size="50" /></TD>
-		</TR>
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.mailPassword" />:</TH>
-			<TD align="left"><html:password property="password" size="50" /></TD>
-		</TR>
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.mailServerType" />:</TH>
-			<TD align="left"><html:select property="type">
-				<html:options collection="serverTypes" property="value"
-					labelProperty="label" />
-			</html:select></TD>
-		</TR>
-
-		<TR>
-			<TH align="right"><bean:message key="prompt.autoConnect" />:</TH>
-			<TD align="left"><html:checkbox property="autoConnect" /></TD>
-		</TR>
-
-		<TR>
-			<TD align="right"><logic:equal name="subscriptionForm"
-				property="action" scope="request" value="Create">
-				<html:submit>
-					<bean:message key="button.save" />
-				</html:submit>
-			</logic:equal> <logic:equal name="subscriptionForm" property="action"
-				scope="request" value="Delete">
-				<html:submit>
-					<bean:message key="button.confirm" />
-				</html:submit>
-			</logic:equal> <logic:equal name="subscriptionForm" property="action"
-				scope="request" value="Edit">
-				<html:submit>
-					<bean:message key="button.save" />
-				</html:submit>
-			</logic:equal></TD>
-			<TD align="left"><logic:notEqual name="subscriptionForm"
-				property="action" scope="request" value="Delete">
-				<html:reset>
-					<bean:message key="button.reset" />
-				</html:reset>
-			</logic:notEqual> &nbsp; <html:cancel>
-				<bean:message key="button.cancel" />
-			</html:cancel></TD>
-		</TR>
-
-	</TABLE>
-
-</html:form>
-
-</BODY>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
deleted file mode 100644
index 20bf3ea48..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/subscription.jsp
+++ /dev/null
@@ -1,144 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="/WEB-INF/app.tld"    prefix="app" %>
-<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
-<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
-<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-<app:checkLogon/>
-
-<%-- In real life, these would be loaded from a database --%>
-<%
-  java.util.ArrayList list = new java.util.ArrayList();
-  list.add(new org.apache.struts.util.LabelValueBean("IMAP Protocol", "imap"));
-  list.add(new org.apache.struts.util.LabelValueBean("POP3 Protocol", "pop3"));
-  pageContext.setAttribute("serverTypes", list);
-%>
-
-<html:html>
-<head>
-<logic:equal name="subscriptionForm" property="action"
-            scope="request" value="Create">
-  <title><bean:message key="subscription.title.create"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
-            scope="request" value="Delete">
-  <title><bean:message key="subscription.title.delete"/></title>
-</logic:equal>
-<logic:equal name="subscriptionForm" property="action"
-            scope="request" value="Edit">
-  <title><bean:message key="subscription.title.edit"/></title>
-</logic:equal>
-<html:base/>
-</head>
-<body bgcolor="white">
-
-<html:errors/>
-
-<html:form action="/saveSubscription" focus="host">
-<html:hidden property="action"/>
-<table border="0" width="100%">
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.username"/>:
-    </th>
-    <td align="left">
-        <bean:write name="user" property="username" filter="true"/>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.mailHostname"/>:
-    </th>
-    <td align="left">
-      <logic:equal name="subscriptionForm" property="action"
-                  scope="request" value="Create">
-        <html:text property="host" size="50"/>
-      </logic:equal>
-      <logic:notEqual name="subscriptionForm" property="action"
-                     scope="request" value="Create">
-        <html:hidden property="host" write="true"/>
-      </logic:notEqual>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.mailUsername"/>:
-    </th>
-    <td align="left">
-      <html:text property="username" size="50"/>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.mailPassword"/>:
-    </th>
-    <td align="left">
-      <html:password property="password" size="50"/>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.mailServerType"/>:
-    </th>
-    <td align="left">
-      <html:select property="type">
-        <html:options collection="serverTypes" property="value"
-                   labelProperty="label"/>
-      </html:select>
-    </td>
-  </tr>
-
-  <tr>
-    <th align="right">
-      <bean:message key="prompt.autoConnect"/>:
-    </th>
-    <td align="left">
-      <html:checkbox property="autoConnect"/>
-    </td>
-  </tr>
-
-  <tr>
-    <td align="right">
-      <logic:equal name="subscriptionForm" property="action"
-                  scope="request" value="Create">
-        <html:submit>
-          <bean:message key="button.save"/>
-        </html:submit>
-      </logic:equal>
-      <logic:equal name="subscriptionForm" property="action"
-                  scope="request" value="Delete">
-        <html:submit>
-          <bean:message key="button.confirm"/>
-        </html:submit>
-      </logic:equal>
-      <logic:equal name="subscriptionForm" property="action"
-                  scope="request" value="Edit">
-        <html:submit>
-          <bean:message key="button.save"/>
-        </html:submit>
-      </logic:equal>
-    </td>
-    <td align="left">
-      <logic:notEqual name="subscriptionForm" property="action"
-                     scope="request" value="Delete">
-        <html:reset>
-          <bean:message key="button.reset"/>
-        </html:reset>
-      </logic:notEqual>
-      &nbsp;
-      <html:cancel>
-        <bean:message key="button.cancel"/>
-      </html:cancel>
-    </td>
-  </tr>
-
-</table>
-
-</html:form>
-
-</body>
-</html:html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
deleted file mode 100644
index c5fa78456..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpen.xml
+++ /dev/null
@@ -1 +0,0 @@
-<
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
deleted file mode 100644
index 6787e487a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tagOpenTagClose.xml
+++ /dev/null
@@ -1 +0,0 @@
-<>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
deleted file mode 100644
index 069235dfa..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.afterDefaultFormat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
-	<tag></tag>
-	<tag></tag>
-	<tag></tag>
-	<tag></tag>
-	<tag>
-		<tag></tag>
-		<tag></tag>
-		<tag></tag>
-		<tag></tag>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
deleted file mode 100644
index 2fa949bb5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/cleanupformat/testfiles/tags.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<tag>
-<tag></tag>
-<tag></tag >
-<tag> </tag>
-<tag> </tag >
-<tag >
-<tag ></tag>
-<tag ></tag >
-<tag > </tag>
-<tag > </tag >
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
deleted file mode 100644
index ac16f838f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/NullStream.java
+++ /dev/null
@@ -1,27 +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.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullStream extends InputStream {
-
-	/* (non-Javadoc)
-	 * @see java.io.InputStream#read()
-	 */
-	public int read() throws IOException {
-		return -1;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
deleted file mode 100644
index 9fe4877d8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestContentTypeHandlers.java
+++ /dev/null
@@ -1,142 +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.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-/**
- * This class is to test very basics of content type handlers.
- * 
- * It tests that
- * 
- * BVT: content registry can be / is created 5 expected contentTypeIdentifiers
- * can be created/found based on id. there is one and only one default content
- * type handler.
- * 
- * 
- * 
- *  
- */
-public class TestContentTypeHandlers extends TestCase {
-	private static final boolean DEBUG = false;
-
-	public TestContentTypeHandlers(String name) {
-		super(name);
-	}
-
-	private static IContentTypeManager getContentTypeRegistry() {
-		IContentTypeManager registry = Platform.getContentTypeManager();
-		return registry;
-	}
-
-	public void testCreation() {
-		IContentTypeManager registry = getContentTypeRegistry();
-		assertTrue("content type identifer registry must exist", registry != null);
-		if (DEBUG) {
-			IContentType[] allTypes = registry.getAllContentTypes();
-			for (int i = 0; i < allTypes.length; i++) {
-				System.out.println(allTypes[i]);
-
-			}
-		}
-	}
-
-	public void testXMLExists() {
-		String id = ContentTypeIdForXML.ContentTypeID_SSEXML;
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getContentType(id);
-		assertTrue("content type identifier " + id + " does not have custom XML type ", identifier != null);
-	}
-
-	public void testHTMLExists() {
-		String id = ContentTypeIdForHTML.ContentTypeID_HTML;
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getContentType(id);
-		assertTrue("content type identifier " + id + " does not have HTML type ", identifier != null);
-	}
-
-	public void testJSPExists() {
-		String id = ContentTypeIdForJSP.ContentTypeID_JSP;
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getContentType(id);
-		assertTrue("content type identifier " + id + " does not have JSP type ", identifier != null);
-	}
-
-	public void testCSSExists() {
-		String id = ContentTypeIdForCSS.ContentTypeID_CSS;
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getContentType(id);
-		assertTrue("content type identifier " + id + " does not have CSS type ", identifier != null);
-	}
-
-	public void testDTDExists() {
-		String id = "org.eclipse.wst.dtd.core.dtdsource";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getContentType(id);
-		assertTrue("content type identifier " + id + " does not have DTD type ", identifier != null);
-	}
-
-	public void testXMLExistsByFileExtension() throws IOException {
-		String filename = "test.xml";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("content type identifier for " + filename + " does not have XML type ", identifier != null);
-	}
-
-	public void testHTMLExistsByFileExtension() throws IOException {
-		String filename = "test.html";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("content type identifier for " + filename + " does not have HTML type ", identifier != null);
-	}
-
-	public void testJSPExistsByFileExtension() throws IOException {
-		String filename = "test.jsp";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("content type identifier for " + filename + " does not have JSP type ", identifier != null);
-	}
-
-	public void testCSSExistsByFileExtension() throws IOException {
-		String filename = "test.css";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("content type identifier for " + filename + " does not have CSS type ", identifier != null);
-	}
-
-	public void testDTDExistsByFileExtension() throws IOException {
-		String filename = "test.dtd";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("content type identifier for " + filename + " does not have DTD type ", identifier != null);
-	}
-
-	public void testMultipleDefinitions() throws IOException {
-		String id = ContentTypeIdForCSS.ContentTypeID_CSS;
-		String filename = "test.css";
-		IContentTypeManager registry = getContentTypeRegistry();
-		IContentType identifier1 = registry.getContentType(id);
-		IContentType identifier2 = registry.getDescriptionFor(new NullStream(), filename, IContentDescription.ALL).getContentType();
-		assertTrue("mulitple content type identifiers need to be equal (but not same instance) ", identifier1.equals(identifier2));
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
deleted file mode 100644
index 420ffb932..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contenttypeidentifier/contentspecific/TestModelHandlers.java
+++ /dev/null
@@ -1,110 +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.jst.jsp.core.tests.contenttypeidentifier.contentspecific;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IModelHandler;
-import org.eclipse.wst.sse.core.internal.modelhandler.ModelHandlerRegistry;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-public class TestModelHandlers extends TestCase {
-	private static ModelHandlerRegistry getModelHandlerRegistry() {
-		ModelHandlerRegistry registry = ModelHandlerRegistry.getInstance();
-		return registry;
-	}
-
-	public TestModelHandlers() {
-		super();
-	}
-
-	public void testCreation() {
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		assertTrue("model handler registry must exist", registry != null);
-	}
-
-	public void testCSSExists() {
-		String id = ContentTypeIdForCSS.ContentTypeID_CSS;  
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerForContentTypeId(id);
-		assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
-	}
-
-	public void testCSSExistsFromFilename() throws IOException {
-		String filename = "test.css";
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerFor(filename, null);
-		assertTrue("model handler registry does not have CSS type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForCSS.ContentTypeID_CSS));
-	}
-
-	public void testDTDExists() {
-		String id = "org.eclipse.wst.dtd.core.dtdsource"; 
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerForContentTypeId(id);
-		assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
-	}
-
-	public void testDTDExistsFromFilename() throws IOException {
-		String filename = "test.dtd";
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerFor(filename, null);
-		assertTrue("model handler registry does not have DTD type ", handler != null && handler.getAssociatedContentTypeId().equals("org.eclipse.wst.dtd.core.dtdsource"));
-	}
-
-	public void testHTMLExists() {
-		String id = ContentTypeIdForHTML.ContentTypeID_HTML;
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerForContentTypeId(id);
-		assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
-	}
-
-	public void testHTMLExistsFromFilename() throws IOException {
-		String filename = "test.html";
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerFor(filename, null);
-		assertTrue("model handler registry does not have HTML type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForHTML.ContentTypeID_HTML));
-	}
-
-	public void testJSPExists() {
-		String id = ContentTypeIdForJSP.ContentTypeID_JSP;
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerForContentTypeId(id);
-		assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(id));
-	}
-
-	public void testJSPExistsFromFilename() throws IOException {
-		String filename = "test.jsp";
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerFor(filename, null);
-		assertTrue("model handler registry does not have JSP type ", handler != null && handler.getAssociatedContentTypeId().equals(ContentTypeIdForJSP.ContentTypeID_JSP));
-	}
-
-	public void testXMLExists() {
-		String id = ContentTypeIdForXML.ContentTypeID_XML;
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerForContentTypeId(id);
-		assertEquals("model handler registry does not have XML type ", id, handler.getAssociatedContentTypeId());
-	}
-
-	public void testXMLExistsFromFilename() throws IOException {
-		String filename = "test.xml";
-		ModelHandlerRegistry registry = getModelHandlerRegistry();
-		IModelHandler handler = registry.getHandlerFor(filename, null);
-		assertEquals("model handler registry does not have XML type ", ContentTypeIdForXML.ContentTypeID_XML, handler.getAssociatedContentTypeId());
-	}
-
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java
deleted file mode 100644
index 2cd2740a5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestImportedNodes.java
+++ /dev/null
@@ -1,43 +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.jst.jsp.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-
-public class TestImportedNodes extends TestCase {
-
-
-	public void testImportedComments() {
-		IDOMModel orgModel = (IDOMModel) StructuredModelManager.getModelManager().
-
-		createUnManagedStructuredModelFor("org.eclipse.jst.jsp.core.jspsource");
-		IDOMModel foreignModel = (IDOMModel) StructuredModelManager.getModelManager().
-
-		createUnManagedStructuredModelFor("org.eclipse.jst.jsp.core.jspsource");
-		foreignModel.getStructuredDocument().set("<%-- abc --%>");
-		Node child = foreignModel.getDocument().getLastChild();
-		// import comment node
-		child = orgModel.getDocument().importNode(child, true);
-		orgModel.getDocument().appendChild(child);
-		// create text node and insert it after comment node
-		child = orgModel.getDocument().createTextNode("abc");
-		orgModel.getDocument().appendChild(child);
-		String text = orgModel.getStructuredDocument().get();
-		assertEquals("document text was not expected", "<%-- abc --%>abc", text);
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
deleted file mode 100644
index e443744cc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/dom/TestOrphan.java
+++ /dev/null
@@ -1,149 +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.jst.jsp.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.tests.Logger;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-/**
- * This test will cause a "region management error" to be thrown in DOM parser
- * (and its subsequent 'handleRefresh' to be called). This is "normal" in this
- * error case, of appending an jsp element to an html document. This
- * error/exception is not normally printed out, but is if 'debug' is turned on.
- */
-
-public class TestOrphan extends TestCase {
-
-	private static final String fCategory = "unittests";
-
-	public TestOrphan(String name) {
-
-		super(name);
-	}
-
-	private Document getJSPDoc() {
-		IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		Document doc = structuredModel.getDocument();
-		return doc;
-	}
-
-	private Document getHTMLDoc() {
-
-		IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForHTML.ContentTypeID_HTML);
-		Document doc = structuredModel.getDocument();
-		return doc;
-	}
-
-	private Element makeElement(Document document) {
-
-		Element element = document.createElement("IMG");
-		element.setAttribute("src", "<bean:message />");
-		return element;
-	}
-
-	public void testNonOrphanInHTMLDoc() {
-
-		Logger.trace(fCategory, "testNonOrphanInHTMLDoc");
-		Document doc = getHTMLDoc();
-		Element element = makeElement(doc);
-		AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
-		String attrValue = attr.getValue();
-		Logger.trace(fCategory, "attrValue: " + attrValue);
-		doc.appendChild(element);
-		boolean isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertFalse(isJspValue);
-	}
-
-	public void testNonOrphanInJSPDoc() {
-
-		Logger.trace(fCategory, "testNonOrphanInJSPDoc");
-		Document doc = getJSPDoc();
-		Element element = makeElement(doc);
-		AttrImpl attr = (AttrImpl) element.getAttributeNode("src");
-		String attrValue = attr.getValue();
-		Logger.trace(fCategory, "attrValue: " + attrValue);
-		doc.appendChild(element);
-		boolean isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertTrue(isJspValue);
-	}
-
-	public void testNonOrphanInBoth() {
-
-		Logger.trace(fCategory, "testNonOrphanInBoth");
-		Document jspDoc = getJSPDoc();
-		Element commonElement = makeElement(jspDoc);
-		AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
-		String attrValue = attr.getValue();
-		Logger.trace(fCategory, "attrValue: " + attrValue);
-		jspDoc.appendChild(commonElement);
-		boolean isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertTrue(isJspValue);
-		Document htmlDoc = getHTMLDoc();
-		// this test will cause a "region management error" to be
-		// thrown in parser (and its subsequent 'handleRefresh').
-		// this is "normal" in this error case, of appending an jsp
-		// element to an html document. This error/exception is not
-		// normally printed out, but is if 'debug' is turned on.
-		htmlDoc.appendChild(commonElement);
-		isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertFalse(isJspValue);
-	}
-
-	public void testNonOrphanInBothReversedOrder() {
-
-		Logger.trace(fCategory, "testNonOrphanInBothReversedOrder");
-		Document htmlDoc = getHTMLDoc();
-		Element commonElement = makeElement(htmlDoc);
-		AttrImpl attr = (AttrImpl) commonElement.getAttributeNode("src");
-		String attrValue = attr.getValue();
-		Logger.trace(fCategory, "attrValue: " + attrValue);
-		htmlDoc.appendChild(commonElement);
-		boolean isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertFalse(isJspValue);
-		Document jspDoc = getJSPDoc();
-		// this little test shows its important to
-		// actually create the element with the right kind of
-		// document, not just append.
-		// (and, append is needed too, as can be seen by
-		// commenting out one or the other of the following
-		// two lines.
-		commonElement = makeElement(jspDoc);
-		jspDoc.appendChild(commonElement);
-		//
-		attr = (AttrImpl) commonElement.getAttributeNode("src");
-		attrValue = attr.getValue();
-		Logger.trace(fCategory, "attrValue: " + attrValue);
-		isJspValue = attr.hasNestedValue();
-		Logger.trace(fCategory, "isJspValue: " + isJspValue);
-		assertTrue(isJspValue);
-	}
-
-	public void doBothTests() {
-
-		testNonOrphanInHTMLDoc();
-		testNonOrphanInJSPDoc();
-		testNonOrphanInBoth();
-		testNonOrphanInBothReversedOrder();
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java
deleted file mode 100644
index c28996f51..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.model;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-
-public class TestModelAdapters extends TestCase {
-
-
-
-	public void testJSPModel() throws IOException {
-		IModelManager modelManager = getModelManager();
-		IDOMModel structuredModel = (IDOMModel) modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		try {
-			boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
-			assertTrue(test);
-			ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) structuredModel.getAdapter(ModelQueryAdapter.class);
-			assertNotNull("initial modelQueryAdapter should not be null", modelQueryAdapter);
-			IStructuredModel newModel = structuredModel.newInstance();
-			// IDOMDocument newDocument = ((IDOMModel)
-			// newModel).getDocument();
-			// INodeNotifier notifier = newDocument;
-			ModelQueryAdapter result = (ModelQueryAdapter) newModel.getAdapter(ModelQueryAdapter.class);
-			assertNotNull("newInstance modelQueryAdapter should not be null", result);
-
-		}
-		finally {
-			// even though model is unmanaged, release still required, since
-			// adapter factories, etc., may be depending on it.
-			structuredModel.releaseFromEdit();
-			// if above complete's normally (with no exceptions)
-			// consider passed.
-			assertTrue(true);
-		}
-	}
-
-	private IModelManager getModelManager() {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		return modelManager;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java
deleted file mode 100644
index 7a5e45624..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelIncludes.java
+++ /dev/null
@@ -1,148 +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.jst.jsp.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMNodeWrapper;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-
-/**
- * Tests for JSP include directives
- */
-public class TestModelIncludes extends TestCase {
-	String wtp_autotest_noninteractive = null;
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		String noninteractive = System.getProperty("wtp.autotest.noninteractive");
-		if (noninteractive != null)
-			wtp_autotest_noninteractive = noninteractive;
-		System.setProperty("wtp.autotest.noninteractive", "true");
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (wtp_autotest_noninteractive != null)
-			System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
-	}
-
-	/**
-	 * Tests the custom tag content model when single line fragments are used
-	 * without trailing white space
-	 * 
-	 * @throws Exception
-	 */
-	public void testContentModelSingleLineIncludedFileWithNoSpacesButWithTaglibInInclude() throws Exception {
-		String projectName = "prj119576_a";
-
-		BundleResourceUtil.createSimpleProject(projectName, null, null);
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
-		assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/prj119576_a/WebContent/body2.jsp"));
-		IDOMModel model = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
-			assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
-			Element element = (Element) model.getIndexedRegion(75);
-			CMElementDeclaration ed = ModelQueryUtil.getModelQuery(model).getCMElementDeclaration(element);
-			assertNotNull("no (TLD) element declaration found for " + element.getNodeName(), ed);
-			assertTrue("not a wrapping content model element declaration: " + ed.getNodeName(), ed instanceof CMNodeWrapper);
-			assertTrue("not a taglib content model element declaration: " + ed.getNodeName(), ((CMNodeWrapper) ed).getOriginNode() instanceof TLDElementDeclaration);
-			String tagClassName = ((TLDElementDeclaration) ((CMNodeWrapper) ed).getOriginNode()).getTagclass();
-			assertNotNull("no tag class name found", tagClassName);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-	}
-
-	/**
-	 * Verify included files are translated properly when they contain a
-	 * multiple lines
-	 * 
-	 * @throws Exception
-	 */
-	public void testTranslateMultiLineIncludedFileWithSpacesAndScriptletInInclude() throws Exception {
-		String projectName = "prj119576_c";
-
-		BundleResourceUtil.createSimpleProject(projectName, null, null);
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
-		assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/" + projectName + "/WebContent/body3.jsp"));
-		IDOMModel model = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
-			assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
-			JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
-			model.getFactoryRegistry().addFactory(factory);
-
-			JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-			String source = adapter.getJSPTranslation().getJavaText();
-			assertTrue("scriptlet with variable declaration not found\n" + source, source.indexOf("java.util.Date headerDate") > -1);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-	}
-
-	/**
-	 * Verify included files are translated properly when they contain a
-	 * single line and document region and no trailing white space.
-	 * 
-	 * @throws Exception
-	 */
-	public void testTranslateSingleLineIncludedFileWithNoSpacesButScriptletInInclude() throws Exception {
-		String projectName = "prj119576_b";
-
-		BundleResourceUtil.createSimpleProject(projectName, null, null);
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
-		assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).exists());
-
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path("/" + projectName + "/WebContent/body3.jsp"));
-		IDOMModel model = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(file);
-			assertTrue("model has no content", model.getStructuredDocument().getLength() > 0);
-
-			JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
-			model.getFactoryRegistry().addFactory(factory);
-
-			JSPTranslationAdapter adapter = (JSPTranslationAdapter) model.getDocument().getAdapterFor(IJSPTranslation.class);
-			String source = adapter.getJSPTranslation().getJavaText();
-			assertTrue("scriptlet with variable declaration not found", source.indexOf("java.util.Date headerDate") > -1);
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java
deleted file mode 100644
index 1b1376368..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelRelease.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class TestModelRelease extends TestCase {
-
-	
-	
-	public void testJSPModel() {
-		IModelManager modelManager = getModelManager();
-		IDOMModel structuredModel = (IDOMModel) modelManager.createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
-		assertTrue(test);
-		// even though model is unmanaged, release still required, since 
-		// adapter factories, etc., may be depending on it. 
-		structuredModel.releaseFromEdit();
-		// if above complete's normally (with no exceptions) 
-		// consider passed. 
-		assertTrue(true);
-	}
-
-	private IModelManager getModelManager() {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		return modelManager;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java
deleted file mode 100644
index f84bee6f7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelWithNoFile.java
+++ /dev/null
@@ -1,152 +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.jst.jsp.core.tests.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-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.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.ContentTypeIdForJSP;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class TestModelWithNoFile extends TestCase {
-
-	public void testJSPModel() {
-		IDOMModel structuredModel = (IDOMModel) StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForJSP.ContentTypeID_JSP);
-		boolean test = structuredModel.getId().equals(IModelManager.UNMANAGED_MODEL);
-		assertTrue(test);
-		structuredModel.releaseFromEdit();
-		assertTrue(true);
-	}
-
-	public void testBug116066_1() {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = null;
-
-		// Create new project
-		IProject project = createSimpleProject("bug116066_1", null, null);
-
-		IFile testFile = project.getFile("nonExistant.jsp");
-		assertFalse("nonExistant.jsp test file already exists (not a clean workspace)?", testFile.exists());
-
-		// Get the model and set a reference to that tag library into it
-		try {
-			model = modelManager.getNewModelForEdit(testFile, false);
-			assertNotNull("couldn't get new model for " + testFile.getFullPath(), model);
-			model.getStructuredDocument().set("<%@taglib prefix=\"tagdependent\" uri=\"tagdependent\">\n<tagdependent:code> <<< </tagdependent:code>");
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testBug116066_2() {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = null;
-
-		// Create new project
-		IProject project = createSimpleProject("bug116066_2", null, null);
-		// Copy a TLD into the project
-		IFile tld = copyBundleEntryIntoWorkspace("/testfiles/116066/tagdep.tld", "/bug116066_2/tagdep.tld");
-		assertNotNull("TLD entry was not copied properly", tld);
-		assertTrue("TLD IFile does not exist", tld.exists());
-
-		IFile testFile = project.getFile("nonExistant.jsp");
-		assertFalse("nonExistant.jsp test file already exists (not a clean workspace)?", testFile.exists());
-
-		// Get the model and set a reference to that tag library into it
-		try {
-			model = modelManager.getNewModelForEdit(testFile, false);
-			assertNotNull("couldn't get new model for " + testFile.getFullPath(), model);
-			model.getStructuredDocument().set("<%@taglib prefix=\"tagdependent\" uri=\"tagdependent\">\n<tagdependent:code> <<< </tagdependent:code>");
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	private IFile copyBundleEntryIntoWorkspace(String entryname, String fullPath) {
-		IFile file = null;
-		URL entry = JSPCoreTestsPlugin.getDefault().getBundle().getEntry(entryname);
-		if (entry != null) {
-			try {
-				byte[] b = new byte[2048];
-				InputStream input = entry.openStream();
-				ByteArrayOutputStream output = new ByteArrayOutputStream();
-				int i = -1;
-				while ((i = input.read(b)) > -1) {
-					output.write(b, 0, i);
-				}
-				file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));
-				if (file != null) {
-					file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
-				}
-			}
-			catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return file;
-	}
-
-	private IProject createSimpleProject(String name, IPath location, String[] natureIds) {
-		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
-		if (location != null) {
-			description.setLocation(location);
-		}
-		if (natureIds != null) {
-			description.setNatureIds(natureIds);
-		}
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		try {
-			project.create(description, new NullProgressMonitor());
-			assertTrue(project.exists());
-			project.open(new NullProgressMonitor());
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return project;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java
deleted file mode 100644
index a19b6f45d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.eclipse.jst.jsp.core.tests.source;
-
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.parser.internal.JSPTokenizer;
-
-public class JSPTokenizerTest extends TestCase {
-	private JSPTokenizer tokenizer = null;
-
-	private void reset(Reader in) {
-		tokenizer.reset(in);
-	}
-
-	private void reset(String filename) {
-		Reader fileReader = null;
-		try {
-			fileReader = new InputStreamReader(getClass().getResourceAsStream(filename), "utf8");
-		}
-		catch (IOException e) {
-		}
-		if (fileReader == null) {
-			fail();
-		}
-		BufferedReader reader = new BufferedReader(fileReader);
-		reset(reader);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		tokenizer = new JSPTokenizer();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		tokenizer = null;
-	}
-
-	public void test144807_AttrName() {
-		String input = "";
-		for (int i = 0; i < 400; i++) {
-			input = input += "<a ";
-		}
-		try {
-			reset(new StringReader(input));
-			assertTrue("empty input", tokenizer.getNextToken() != null);
-			while (tokenizer.getNextToken() != null) {
-				// really, we just want to loop
-			}
-		}
-		catch (IOException e) {
-			fail(e.getMessage());
-		}
-	}
-
-	public void test144807_AttrValue() {
-		String input = "<a b=";
-		for (int i = 0; i < 400; i++) {
-			input = input += "<a ";
-		}
-		try {
-			reset(new StringReader(input));
-			assertTrue("empty input", tokenizer.getNextToken() != null);
-			while (tokenizer.getNextToken() != null) {
-				// really, we just want to loop
-			}
-		}
-		catch (IOException e) {
-			fail(e.getMessage());
-		}
-	}
-
-	public void test144807_Equals() {
-		String input = "<a b";
-		for (int i = 0; i < 400; i++) {
-			input = input += "<a ";
-		}
-		try {
-			reset(new StringReader(input));
-			assertTrue("empty input", tokenizer.getNextToken() != null);
-			while (tokenizer.getNextToken() != null) {
-				// really, we just want to loop
-			}
-		}
-		catch (IOException e) {
-			fail(e.getMessage());
-		}
-	}
-
-	public void testInsertComment() {
-		reset("jspcomment01.jsp");
-		try {
-			assertTrue("empty input", tokenizer.getNextToken() != null);
-			while (tokenizer.getNextToken() != null) {
-				// really, we just want to loop
-			}
-		}
-		catch (IOException e) {
-		}
-		catch (StackOverflowError e) {
-			fail(e.getMessage());
-			return;
-		}
-		// success if StackOverFlowError does not occur with tokenizer.
-		assertTrue(true);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/jspcomment01.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/jspcomment01.jsp
deleted file mode 100644
index 71a8c053e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/jspcomment01.jsp
+++ /dev/null
@@ -1,222 +0,0 @@
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
-<%-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa --%>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java
deleted file mode 100644
index c8d26672f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.jst.jsp.core.tests.taglibindex;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-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.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-
-public class BundleResourceUtil {
-
-	public static void _copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
-		Enumeration entries = JSPCoreTestsPlugin.getDefault().getBundle().getEntryPaths(rootEntry);
-		while (entries != null && entries.hasMoreElements()) {
-			String entryPath = entries.nextElement().toString();
-			String targetPath = new Path(fullTargetPath + "/" + entryPath.substring(rootEntry.length())).toString();
-			if (entryPath.endsWith("/")) {
-				IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(new Path(targetPath));
-				if (!folder.exists()) {
-					folder.create(true, true, new NullProgressMonitor());
-				}
-				_copyBundleEntriesIntoWorkspace(entryPath, targetPath);
-			}
-			else {
-				_copyBundleEntryIntoWorkspace(entryPath, targetPath);
-			}
-			// System.out.println(entryPath + " -> " + targetPath);
-		}
-	}
-
-	public static IFile _copyBundleEntryIntoWorkspace(String entryname, String fullPath) throws CoreException {
-		IFile file = null;
-		URL entry = JSPCoreTestsPlugin.getDefault().getBundle().getEntry(entryname);
-		if (entry != null) {
-			try {
-				byte[] b = new byte[2048];
-				InputStream input = entry.openStream();
-				ByteArrayOutputStream output = new ByteArrayOutputStream();
-				int i = -1;
-				while ((i = input.read(b)) > -1) {
-					output.write(b, 0, i);
-				}
-				file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fullPath));
-				if (file != null) {
-					if (!file.exists()) {
-						file.create(new ByteArrayInputStream(output.toByteArray()), true, new NullProgressMonitor());
-					}
-					else {
-						file.setContents(new ByteArrayInputStream(output.toByteArray()), true, false, new NullProgressMonitor());
-					}
-				}
-			}
-			catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return file;
-	}
-
-	public static void copyBundleEntriesIntoWorkspace(final String rootEntry, final String fullTargetPath) throws CoreException {
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				_copyBundleEntriesIntoWorkspace(rootEntry, fullTargetPath);
-				ResourcesPlugin.getWorkspace().checkpoint(true);
-			}
-		};
-		ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
-	}
-
-	public static IFile copyBundleEntryIntoWorkspace(final String entryname, final String fullPath) throws CoreException {
-		final IFile file[] = new IFile[1];
-		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
-			public void run(IProgressMonitor monitor) throws CoreException {
-				file[0] = _copyBundleEntryIntoWorkspace(entryname, fullPath);
-				ResourcesPlugin.getWorkspace().checkpoint(true);
-			}
-		};
-		ResourcesPlugin.getWorkspace().run(runnable, new NullProgressMonitor());
-		return file[0];
-	}
-
-	/**
-	 * Creates a simple project.
-	 * 
-	 * @param name -
-	 *            the name of the project
-	 * @param location -
-	 *            the location of the project, or null if the default of
-	 *            "/name" within the workspace is to be used
-	 * @param natureIds -
-	 *            an array of natures IDs to set on the project, null if none
-	 *            should be set
-	 * @return
-	 */
-	public static IProject createSimpleProject(String name, IPath location, String[] natureIds) {
-		IProjectDescription description = ResourcesPlugin.getWorkspace().newProjectDescription(name);
-		if (location != null) {
-			description.setLocation(location);
-		}
-		if (natureIds != null) {
-			description.setNatureIds(natureIds);
-		}
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-		try {
-			project.create(description, new NullProgressMonitor());
-			project.open(new NullProgressMonitor());
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return project;
-	}
-	public static final String JAVA_NATURE_ID = "org.eclipse.jdt.core.javanature";
-	
-	/**
-	 * Add a library entry (like a jar) to the classpath of a project.
-	 * The jar must be in your poject. You can copy the jar into your workspace using
-	 * copyBundleEntryIntoWorkspace(String entryname, String fullPath)
-	 * 
-	 * @param proj assumed it has java nature
-	 * @param pathToJar project relative, no leading slash
-	 */
-	public static void addLibraryEntry(IProject proj, String pathToJar) {
-		
-		IPath projLocation = proj.getLocation();
-		IPath absJarPath = projLocation.append(pathToJar);
-		
-		IJavaProject jProj = JavaCore.create(proj);
-		
-		IClasspathEntry strutsJarEntry = JavaCore.newLibraryEntry(absJarPath, null, null);
-		try {
-			IClasspathEntry[] currentEntries = jProj.getRawClasspath();
-			
-			List l = new ArrayList();
-			l.addAll(Arrays.asList(currentEntries));
-			l.add(strutsJarEntry);
-			
-			IClasspathEntry[] newEntries = (IClasspathEntry[])l.toArray(new IClasspathEntry[l.size()]);
-			jProj.setRawClasspath(newEntries, new NullProgressMonitor());
-		}
-		catch (JavaModelException e) {
-			e.printStackTrace();
-		}	
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java
deleted file mode 100644
index 024ee5c24..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java
+++ /dev/null
@@ -1,376 +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.jst.jsp.core.tests.taglibindex;
-
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.internal.core.ClasspathEntry;
-import org.eclipse.jst.jsp.core.taglib.IJarRecord;
-import org.eclipse.jst.jsp.core.taglib.ITaglibRecord;
-import org.eclipse.jst.jsp.core.taglib.IURLRecord;
-import org.eclipse.jst.jsp.core.taglib.TaglibIndex;
-
-/**
- * Tests for the TaglibIndex.
- */
-public class TestIndex extends TestCase {
-	String wtp_autotest_noninteractive = null;
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		String noninteractive = System.getProperty("wtp.autotest.noninteractive");
-		if (noninteractive != null)
-			wtp_autotest_noninteractive = noninteractive;
-		System.setProperty("wtp.autotest.noninteractive", "true");
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (wtp_autotest_noninteractive != null)
-			System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
-	}
-
-	public void testBug118251_e() throws Exception {
-		String url = "http://example.com/sample2_for_118251-e";
-
-		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject("bug_118251-e", null, null);
-		assertTrue(project.exists());
-		ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e"));
-		assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-e", "/bug_118251-e");
-		// bug_118251-e/WebContent/WEB-INF/web.xml
-		// bug_118251-e/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
-		// bug_118251-e/WebContent/META-INF/MANIFEST.MF
-		// bug_118251-e/WebContent/test1.jsp
-		// bug_118251-e/.classpath
-		// bug_118251-e/.project
-		ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-e/WebContent/test1.jsp", url, false);
-		assertNotNull("record found for " + url, taglibRecord);
-
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e/WebContent/"));
-		assertEquals("wrong number of taglib records found after unpacking but before copying", 2, records.length);
-
-		/*
-		 * increase by <b>one</b> for the URL to the TLD in the jar (one
-		 * implicit for the TLD in the jar as a resource and another implicit
-		 * overwriting it with the same URL to the TLD in the jar on the
-		 * classpath)
-		 */
-		BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-e/WebContent/WEB-INF/sample_tld.jar");
-
-		url = "http://example.com/sample-taglib";
-		taglibRecord = TaglibIndex.resolve("/bug_118251-e/WebContent/test1.jsp", url, false);
-		assertNotNull("no record found for " + url, taglibRecord);
-
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-e/WebContent/"));
-		assertEquals("wrong number of taglib records found after copying", 3, records.length);
-	}
-
-	public void testBug118251_f() throws Exception {
-		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject("bug_118251-f", null, null);
-		assertTrue(project.exists());
-		ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f"));
-		assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-f", "/bug_118251-f");
-		// bug_118251-f/WebContent/WEB-INF/web.xml
-		// bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
-		// bug_118251-f/WebContent/META-INF/MANIFEST.MF
-		// bug_118251-f/WebContent/test1.jsp
-		// bug_118251-f/.classpath
-		// bug_118251-f/.project
-		String url = "http://example.com/sample-taglib";
-		ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-f/WebContent/test1.jsp", url, false);
-		assertNull("record found for " + url, taglibRecord);
-
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/"));
-		assertEquals("wrong number of taglib records found after unpacking but before copying", 3, records.length);
-
-		/*
-		 * increase by <b>one</b> for the URL to the TLD in the jar (one
-		 * implicit for the TLD in the jar as a resource and another implicit
-		 * overwriting it with the same URL to the TLD in the jar on the
-		 * classpath)
-		 */
-		BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-f/WebContent/WEB-INF/lib/sample_tld.jar");
-
-		taglibRecord = TaglibIndex.resolve("/bug_118251-f/WebContent/test1.jsp", url, false);
-		assertNotNull("no record found for " + url, taglibRecord);
-		assertTrue("record found was wrong type", taglibRecord instanceof IURLRecord);
-		assertNotNull("record has no base location", ((IURLRecord) taglibRecord).getBaseLocation());
-		assertEquals("record has wrong short name", "sample", ((IURLRecord) taglibRecord).getShortName());
-		assertEquals("record has wrong URI", url, ((IURLRecord) taglibRecord).getURI());
-		URL recordURL = ((IURLRecord) taglibRecord).getURL();
-		assertNotNull("record has no URL", recordURL);
-		assertTrue("record has wrong URL", recordURL.toString().length() > 4);
-		assertEquals("record has wrong URL protocol", "jar:", recordURL.toString().substring(0, 4));
-		assertEquals("record has wrong URL", "/bug_118251-f/WebContent/WEB-INF/lib/sample_tld.jar!/folder/sample_for_118251.tld", recordURL.toString().substring(recordURL.toString().length() - 81));
-
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/"));
-		assertEquals("wrong number of taglib records found after copying", 4, records.length);
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent"));
-		assertEquals("wrong number of taglib records found after copying", 4, records.length);
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/WEB-INF"));
-		assertEquals("wrong number of taglib records found after copying", 4, records.length);
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-f/WebContent/WEB-INF/web.xml"));
-		assertEquals("wrong number of taglib records found after copying", 4, records.length);
-	}
-
-	public void testBug118251_g() throws Exception {
-		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject("bug_118251-g", null, null);
-		assertTrue(project.exists());
-		ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g"));
-		assertEquals("wrong number of taglib records found before unpacking", 0, records.length);
-
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_118251-g", "/bug_118251-g");
-		// bug_118251-g/Web Content/WEB-INF/web.xml
-		// bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
-		// bug_118251-g/Web Content/META-INF/MANIFEST.MF
-		// bug_118251-g/Web Content/test1.jsp
-		// bug_118251-g/.classpath
-		// bug_118251-g/.project
-		String url = "http://example.com/sample-taglib";
-		ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_118251-g/Web Content/test1.jsp", url, false);
-		assertNull("record found for " + url, taglibRecord);
-
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/"));
-		assertEquals("wrong number of taglib records found after unpacking but before copying", 3, records.length);
-
-		/*
-		 * increase by <b>one</b> for the URL to the TLD in the jar (one
-		 * implicit for the TLD in the jar as a resource and another implicit
-		 * overwriting it with the same URL to the TLD in the jar on the
-		 * classpath)
-		 */
-		BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/bug_118251-g/Web Content/WEB-INF/lib/sample_tld.jar");
-
-		taglibRecord = TaglibIndex.resolve("/bug_118251-g/Web Content/test1.jsp", url, false);
-		assertNotNull("no record found for " + url, taglibRecord);
-		assertTrue("record found was wrong type", taglibRecord instanceof IURLRecord);
-		assertNotNull("record has no base location", ((IURLRecord) taglibRecord).getBaseLocation());
-		assertEquals("record has wrong short name", "sample", ((IURLRecord) taglibRecord).getShortName());
-		assertEquals("record has wrong URI", url, ((IURLRecord) taglibRecord).getURI());
-		URL recordURL = ((IURLRecord) taglibRecord).getURL();
-		assertNotNull("record has no URL", recordURL);
-		assertTrue("record has wrong URL", recordURL.toString().length() > 4);
-		assertEquals("record has wrong URL protocol", "jar:", recordURL.toString().substring(0, 4));
-		assertEquals("record has wrong URL", "/bug_118251-g/Web Content/WEB-INF/lib/sample_tld.jar!/folder/sample_for_118251.tld", recordURL.toString().substring(recordURL.toString().length() - 82));
-
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/"));
-		assertEquals("wrong number of taglib records found after copying", 4, records.length);
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content"));
-		assertEquals("wrong number of taglib records found after copying", 4, records.length);
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/WEB-INF"));
-		assertEquals("wrong number of taglib records found after copying", 4, records.length);
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_118251-g/Web Content/WEB-INF/web.xml"));
-		assertEquals("wrong number of taglib records found after copying", 4, records.length);
-	}
-
-	public void test_148717_a() throws Exception {
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("bug_148717");
-		if (!project.exists()) {
-			// Create new project
-			project = BundleResourceUtil.createSimpleProject("bug_148717", null, null);
-			assertTrue(project.exists());
-			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug_148717", "/bug_148717");
-		}
-
-		IFile file = project.getFile("/WebContent/WEB-INF/lib/internal.jar");
-		assertTrue(file.exists());
-
-		String uri = "http://example.com/external-uri";
-		ITaglibRecord taglibRecord = TaglibIndex.resolve("/bug_148717/WebContent/", uri, false);
-		assertNotNull("record not found for " + uri, taglibRecord);
-		assertEquals(ITaglibRecord.JAR, taglibRecord.getRecordType());
-		assertEquals(uri, ((IJarRecord) taglibRecord).getURI());
-
-		ITaglibRecord taglibRecord2 = null;
-		ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/bug_148717/WebContent/"));
-		for (int i = 0; i < records.length; i++) {
-			int type = records[i].getRecordType();
-			switch (type) {
-				case ITaglibRecord.JAR : {
-					taglibRecord2 = records[i];
-				}
-					break;
-			}
-		}
-		assertNotNull("record not returned for " + uri, taglibRecord2);
-		assertEquals(ITaglibRecord.JAR, taglibRecord2.getRecordType());
-		assertEquals(uri, ((IJarRecord) taglibRecord2).getURI());
-	}
-
-	/**
-	 * test caching from session-to-session
-	 */
-	public void testCaching1() throws Exception {
-		TaglibIndex.shutdown();
-		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject("testcache1", null, null);
-		assertTrue(project.exists());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testcache1", "/testcache1");
-		BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/testcache1/WebContent/WEB-INF/lib/sample_tld.jar");
-		TaglibIndex.startup();
-
-		ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match", 5, records.length);
-
-		TaglibIndex.shutdown();
-		TaglibIndex.startup();
-		ITaglibRecord[] records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match (1st restart)", records.length, records2.length);
-		TaglibIndex.shutdown();
-		TaglibIndex.startup();
-		records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match (2nd restart)", records.length, records2.length);
-		TaglibIndex.shutdown();
-		TaglibIndex.startup();
-		records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache1/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match (3rd restart)", records.length, records2.length);
-	}
-
-	/**
-	 * test caching from session-to-session with an addition in one session
-	 */
-	public void testCachingWithAddingLibrary() throws Exception {
-		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject("testcache2", null, null);
-		assertTrue(project.exists());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testcache2", "/testcache2");
-
-		ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
-		TaglibIndex.shutdown();
-
-		TaglibIndex.startup();
-		ITaglibRecord[] records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match (1st restart)", records.length, records2.length);
-		BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/testcache2/WebContent/WEB-INF/lib/sample_tld.jar");
-		records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match (1st restart, added jar file)", records.length + 1, records2.length);
-		TaglibIndex.shutdown();
-
-		TaglibIndex.startup();
-		records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match (2nd restart)", records.length + 1, records2.length);
-		BundleResourceUtil.addLibraryEntry(project, "WebContent/WEB-INF/lib/sample_tld.jar");
-		TaglibIndex.shutdown();
-
-		TaglibIndex.startup();
-		assertEquals("total ITaglibRecord count doesn't match (3nd restart)", records.length + 1, records2.length);
-		TaglibIndex.shutdown();
-
-		TaglibIndex.startup();
-		records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testcache2/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match changed value (4th restart, add jar to build path)", records.length + 2, records2.length);
-	}
-
-	public void testAvailableFromExportedBuildpaths() throws Exception {
-		TaglibIndex.shutdown();
-
-		// Create project 1
-		IProject project = BundleResourceUtil.createSimpleProject("testavailable1", null, null);
-		assertTrue(project.exists());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testavailable1", "/testavailable1");
-
-		// Create project 2
-		IProject project2 = BundleResourceUtil.createSimpleProject("testavailable2", null, null);
-		assertTrue(project2.exists());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/testavailable2", "/testavailable2");
-		BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/bug_118251-sample/sample_tld.jar", "/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar");
-
-		TaglibIndex.startup();
-
-		// make sure project 1 sees no taglibs
-		ITaglibRecord[] records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable1/WebContent"));
-		assertEquals("ITaglibRecords were found", 0, records.length);
-		// make sure project 2 sees two taglibs
-		ITaglibRecord[] records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
-		if(records2.length != 2) {
-			for (int i = 0; i < records2.length; i++) {
-				System.err.println(records2[i]);
-			}
-		}
-		assertEquals("total ITaglibRecord count doesn't match", 2, records2.length);
-
-		TaglibIndex.shutdown();
-		TaglibIndex.startup();
-
-
-		records2 = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match after restart", 2, records2.length);
-
-		IJavaProject created = JavaCore.create(project2);
-		assertTrue("/availabletest2 not a Java project", created.exists());
-
-		// export the jar from project 2
-		IClasspathEntry[] entries = created.getRawClasspath();
-		boolean found = false;
-		for (int i = 0; i < entries.length; i++) {
-			IClasspathEntry entry = entries[i];
-			if (entry.getPath().equals(new Path("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar"))) {
-				found = true;
-				assertFalse("was exported", ((ClasspathEntry) entry).isExported);
-				((ClasspathEntry) entry).isExported = true;
-			}
-		}
-		assertTrue("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar was not found in build path", found);
-		IClasspathEntry[] entries2 = new IClasspathEntry[entries.length];
-		System.arraycopy(entries, 1, entries2, 0, entries.length - 1);
-		entries2[entries.length - 1] = entries[0];
-		created.setRawClasspath(entries2, new NullProgressMonitor());
-
-		entries = created.getRawClasspath();
-		found = false;
-		for (int i = 0; i < entries.length; i++) {
-			IClasspathEntry entry = entries[i];
-			if (entry.getPath().equals(new Path("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar"))) {
-				found = true;
-				assertTrue("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar was not exported", ((ClasspathEntry) entry).isExported);
-			}
-		}
-		assertTrue("/testavailable2/WebContent/WEB-INF/lib/sample_tld.jar was not found in build path", found);
-
-		// project 2 should still have just two taglibs
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match (after exporting jar)", 2, records.length);
-
-		// now one taglib should be visible from project 1
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable1/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match (after exporting jar)", 1, records.length);
-
-		TaglibIndex.shutdown();
-		TaglibIndex.startup();
-
-		// project 2 should still have just two taglibs
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable2/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match (after exporting jar and restarting)", 2, records.length);
-
-		// and one taglib should still be visible from project 1
-		records = TaglibIndex.getAvailableTaglibRecords(new Path("/testavailable1/WebContent"));
-		assertEquals("total ITaglibRecord count doesn't match (after exporting jar and restarting)", 1, records.length);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
deleted file mode 100644
index 84756f617..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.jsp.core.tests.translation;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.jsp.core.internal.java.IJSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslation;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapter;
-import org.eclipse.jst.jsp.core.internal.java.JSPTranslationAdapterFactory;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-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.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class JSPJavaTranslatorCoreTest extends TestCase {
-
-	static final String WTP_AUTOTEST_NONINTERACTIVE = "wtp.autotest.noninteractive";
-
-	public JSPJavaTranslatorCoreTest() {
-	}
-
-	public JSPJavaTranslatorCoreTest(String name) {
-		super(name);
-	}
-
-	String wtp_autotest_noninteractive = null;
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		String noninteractive = System.getProperty(WTP_AUTOTEST_NONINTERACTIVE);
-		if (noninteractive != null)
-			wtp_autotest_noninteractive = noninteractive;
-		System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, "true");
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (wtp_autotest_noninteractive != null)
-			System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, wtp_autotest_noninteractive);
-	}
-
-	public void test_107338() throws Exception {
-		String projectName = "bug_107338";
-		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject(projectName, null, null);
-		assertTrue(project.exists());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + projectName, "/" + projectName);
-		IFile file = project.getFile("WebContent/test107338.jsp");
-		assertTrue(file.exists());
-
-		IStructuredModel model = StructuredModelManager.getModelManager().getModelForRead(file);
-		IDOMModel jspModel = (IDOMModel) model;
-
-		String jspSource = model.getStructuredDocument().get();
-		
-		assertTrue("line delimiters have been converted to Windows [CRLF]", jspSource.indexOf("\r\n") < 0);
-		assertTrue("line delimiters have been converted to Mac [CR]", jspSource.indexOf("\r") < 0);
-
-		if (model.getFactoryRegistry().getFactoryFor(IJSPTranslation.class) == null) {
-			JSPTranslationAdapterFactory factory = new JSPTranslationAdapterFactory();
-			model.getFactoryRegistry().addFactory(factory);
-		}
-		IDOMDocument xmlDoc = jspModel.getDocument();
-		JSPTranslationAdapter translationAdapter = (JSPTranslationAdapter) xmlDoc.getAdapterFor(IJSPTranslation.class);
-		JSPTranslation translation = translationAdapter.getJSPTranslation();
-		// System.err.print(translation.getJavaText());
-
-		assertTrue("new-line beginning scriptlet missing from translation", translation.getJavaText().indexOf("int i = 0;") >= 0);
-
-		model.releaseFromRead();
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPJavaValidatorTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPJavaValidatorTest.java
deleted file mode 100644
index 622071df3..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPJavaValidatorTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.jsp.core.tests.validation;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.jsp.core.internal.contentproperties.JSPFContentProperties;
-import org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;
-import org.eclipse.jst.jsp.core.internal.validation.JSPValidator;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-/**
- * Tests JSP Java Validator
- */
-public class JSPJavaValidatorTest extends TestCase {
-	String wtp_autotest_noninteractive = null;
-	private static final String PROJECT_NAME = "bug_87351";
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		String noninteractive = System.getProperty("wtp.autotest.noninteractive");
-		if (noninteractive != null)
-			wtp_autotest_noninteractive = noninteractive;
-		System.setProperty("wtp.autotest.noninteractive", "true");
-
-		if (!ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists()) {
-			BundleResourceUtil.createSimpleProject(PROJECT_NAME, null, new String[]{JavaCore.NATURE_ID});
-			BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + PROJECT_NAME, "/" + PROJECT_NAME);
-		}
-		assertTrue("project could not be created", ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME).exists());
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		if (wtp_autotest_noninteractive != null)
-			System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
-	}
-
-	/**
-	 * Tests if jsp fragments are validated when preference is set to true
-	 * 
-	 * @throws Exception
-	 */
-	public void testValidatingFragments() throws Exception {
-		JSPValidator validator = new JSPJavaValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/ihaveerrors.jspf";
-		helper.setURI(filePath);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
-		String validate = JSPFContentProperties.getProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, false);
-		JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, Boolean.toString(true));
-		validator.validate(helper, reporter);
-
-		if (validate != null) {
-			JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, validate);
-		}
-		assertTrue("jspf was not validated when it should have been", !reporter.getMessages().isEmpty());
-	}
-
-	/**
-	 * Tests if jsp fragments are not validated when preference is set to
-	 * false
-	 * 
-	 * @throws Exception
-	 */
-	public void testNoValidatingFragments() throws Exception {
-		JSPValidator validator = new JSPValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/ihaveerrors.jspf";
-		helper.setURI(filePath);
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-
-		String validate = JSPFContentProperties.getProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, false);
-		JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, Boolean.toString(false));
-		validator.validate(helper, reporter);
-
-		if (validate != null) {
-			JSPFContentProperties.setProperty(JSPFContentProperties.VALIDATE_FRAGMENTS, file, validate);
-		}
-		assertTrue("jspf was validated when it should not have been", reporter.getMessages().isEmpty());
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ReporterForTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ReporterForTest.java
deleted file mode 100644
index 557768c89..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ReporterForTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.jsp.core.tests.validation;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.validation.internal.core.IMessageAccess;
-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;
-
-class ReporterForTest implements IReporter {
-	List list = new ArrayList();
-
-	public ReporterForTest() {
-		super();
-	}
-
-	public void addMessage(IValidator origin, IMessage message) {
-		list.add(message);
-	}
-
-	public void displaySubtask(IValidator validator, IMessage message) {
-		/* do not need to implement */
-	}
-
-	public IMessageAccess getMessageAccess() {
-		return null;
-	}
-
-	public boolean isCancelled() {
-		return false;
-	}
-
-	public void removeAllMessages(IValidator origin, Object object) { // do
-		/* do not need to implement */
-	}
-
-	public void removeAllMessages(IValidator origin) {
-		/* do not need to implement */
-	}
-
-	public void removeMessageSubset(IValidator validator, Object obj, String groupName) {// do
-		/* do not need to implement */
-	}
-
-	public List getMessages() {
-		return list;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ValidationContextForTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ValidationContextForTest.java
deleted file mode 100644
index 34956c0ea..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/ValidationContextForTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.jsp.core.tests.validation;
-
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-
-class ValidationContextForTest implements IValidationContext {
-	private String fURI = null;
-
-	public void setURI(String uri) {
-		fURI = uri;
-	}
-
-	public String[] getURIs() {
-		if (fURI != null)
-			return new String[]{fURI};
-		return new String[0];
-	}
-
-	public Object loadModel(String symbolicName) {
-		return null;
-	}
-
-	public Object loadModel(String symbolicName, Object[] parms) {
-		return null;
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/source/JSPedCSSSourceParserTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/source/JSPedCSSSourceParserTest.java
deleted file mode 100644
index ffc975d47..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/source/JSPedCSSSourceParserTest.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jst.jsp.css.core.tests.source;
-
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jst.jsp.core.tests.NullInputStream;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-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.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.osgi.framework.Bundle;
-
-/**
- * 
- */
-public class JSPedCSSSourceParserTest extends TestCase {
-	private static final String FILES_DIR = "src/org/eclipse/jst/jsp/css/core/tests/testfiles"; //$NON-NLS-1$
-	private static final String RESULTS_DIR = "src/org/eclipse/jst/jsp/css/core/tests/testfiles/results"; //$NON-NLS-1$
-	private static final String MODE_OPEN = "MODE_OPEN"; //$NON-NLS-1$
-	private static final String MODE_APPEND = "MODE_APPEND"; //$NON-NLS-1$
-	private static final String MODE_INSERT = "MODE_INSERT"; //$NON-NLS-1$
-	private static final String commonEOL = "\r\n";//$NON-NLS-1$
-
-	public void testSourceOpen1() throws IOException {
-		sourceParserTest("sample01.jsp", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend1() throws IOException {
-		sourceParserTest("sample01.jsp", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert1() throws IOException {
-		sourceParserTest("sample01.jsp", MODE_INSERT); //$NON-NLS-1$
-	}
-	
-	public void testSourceOpen2() throws IOException {
-		sourceParserTest("sample02.jsp", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend2() throws IOException {
-		sourceParserTest("sample02.jsp", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen3() throws IOException {
-		sourceParserTest("sample03.jsp", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend3() throws IOException {
-		sourceParserTest("sample03.jsp", MODE_APPEND); //$NON-NLS-1$
-	}
-	/*
-	 * The following test case fails with WTP 1.5 RC2, but, ignore this release.
-	 * 
-	public void testSourceInsert2() throws IOException {
-		sourceParserTest("sample02.jsp", MODE_INSERT); //$NON-NLS-1$
-	}
-	public void testSourceInsert3() throws IOException {
-		sourceParserTest("sample03.jsp", MODE_INSERT); //$NON-NLS-1$
-	}
-	public void testSourceInsert6() throws IOException {
-		sourceParserTest("sample06.jsp", MODE_INSERT); //$NON-NLS-1$
-	}
-	public void testSourceInsert8() throws IOException {
-		sourceParserTest("sample02.jspf", MODE_INSERT); //$NON-NLS-1$
-	}
-	public void testSourceInsert9() throws IOException {
-		sourceParserTest("sample03.jspf", MODE_INSERT); //$NON-NLS-1$
-	}
-	public void testSourceInsert12() throws IOException {
-		sourceParserTest("sample06.jspf", MODE_INSERT); //$NON-NLS-1$
-	}
-	*
-	*/
-	public void testSourceOpen4() throws IOException {
-		sourceParserTest("sample04.jsp", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend4() throws IOException {
-		sourceParserTest("sample04.jsp", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert4() throws IOException {
-		sourceParserTest("sample04.jsp", MODE_INSERT); //$NON-NLS-1$
-	}
-	public void testSourceOpen5() throws IOException {
-		sourceParserTest("sample05.jsp", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend5() throws IOException {
-		sourceParserTest("sample05.jsp", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert5() throws IOException {
-		sourceParserTest("sample05.jsp", MODE_INSERT); //$NON-NLS-1$
-	}
-	public void testSourceOpen6() throws IOException {
-		sourceParserTest("sample06.jsp", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend6() throws IOException {
-		sourceParserTest("sample06.jsp", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen7() throws IOException {
-		sourceParserTest("sample01.jspf", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend7() throws IOException {
-		sourceParserTest("sample01.jspf", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert7() throws IOException {
-		sourceParserTest("sample01.jspf", MODE_INSERT); //$NON-NLS-1$
-	}
-	
-	public void testSourceOpen8() throws IOException {
-		sourceParserTest("sample02.jspf", MODE_OPEN); //$NON-NLS-1$
-	}
-	
-	public void testSourceAppend8() throws IOException {
-		sourceParserTest("sample02.jspf", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen9() throws IOException {
-		sourceParserTest("sample03.jspf", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend9() throws IOException {
-		sourceParserTest("sample03.jspf", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen10() throws IOException {
-		sourceParserTest("sample04.jspf", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend10() throws IOException {
-		sourceParserTest("sample04.jspf", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert10() throws IOException {
-		sourceParserTest("sample04.jspf", MODE_INSERT); //$NON-NLS-1$
-	}
-	public void testSourceOpen11() throws IOException {
-		sourceParserTest("sample05.jspf", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend11() throws IOException {
-		sourceParserTest("sample05.jspf", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert11() throws IOException {
-		sourceParserTest("sample05.jspf", MODE_INSERT); //$NON-NLS-1$
-	}
-	
-	public void testSourceOpen12() throws IOException {
-		sourceParserTest("sample06.jspf", MODE_OPEN); //$NON-NLS-1$
-	}
-	
-	public void testSourceAppend12() throws IOException {
-		sourceParserTest("sample06.jspf", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen13() throws IOException {
-		sourceParserTest("sample07.jspf", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend13() throws IOException {
-		sourceParserTest("sample07.jspf", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert13() throws IOException {
-		sourceParserTest("sample07.jspf", MODE_INSERT); //$NON-NLS-1$
-	}
-	public void testSourceOpen14() throws IOException {
-		sourceParserTest("sample07.jsp", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend14() throws IOException {
-		sourceParserTest("sample07.jsp", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert14() throws IOException {
-		sourceParserTest("sample07.jsp", MODE_INSERT); //$NON-NLS-1$
-	}
-	
-	protected void setUp() throws Exception {
-		// set cssjsptestX.jsp(f) file as css jsp.
-		IContentType ct = Platform.getContentTypeManager().getContentType("org.eclipse.jst.jsp.core.cssjspsource");
-		ct.addFileSpec("cssjsptest0.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest1.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest2.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest3.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest4.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest5.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest6.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest7.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest8.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest9.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest10.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest11.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest12.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest13.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest14.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest15.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest16.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest17.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest18.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest19.jsp", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest20.jsp", IContentType.FILE_NAME_SPEC);
-		ct = Platform.getContentTypeManager().getContentType("org.eclipse.jst.jsp.core.cssjspfragmentsource");
-		ct.addFileSpec("cssjsptest0.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest1.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest2.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest3.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest4.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest5.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest6.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest7.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest8.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest9.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest10.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest11.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest12.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest13.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest14.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest15.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest16.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest17.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest18.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest19.jspf", IContentType.FILE_NAME_SPEC);
-		ct.addFileSpec("cssjsptest20.jspf", IContentType.FILE_NAME_SPEC);
-	}
-
-	static int index_jsp = 0;
-	static int index_jspf = 0;
-	private ICSSModel createModel(boolean isFragment) {
-		IStructuredModel model = null;
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			model = !isFragment ? modelManager.getModelForEdit("cssjsptest" + index_jsp++ + ".jsp", new NullInputStream(), null) : //$NON-NLS-1$
-									modelManager.getModelForEdit("cssjsptest" + index_jspf++ + ".jspf", new NullInputStream(), null); //$NON-NLS-1$
-			model.getStructuredDocument().setLineDelimiter(commonEOL);//$NON-NLS-1$
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		return (ICSSModel) model;
-
-	}
-	private File createFile(String directory, String filename) throws IOException {
-		Bundle bundle = Platform.getBundle("org.eclipse.jst.jsp.core.tests"); //$NON-NLS-1$
-		URL url = bundle.getEntry("/"); //$NON-NLS-1$
-		URL localURL = FileLocator.toFileURL(url);
-		String installPath = localURL.getPath();
-		String totalDirectory = installPath + directory;
-		String totalPath = totalDirectory + "/" + filename; //$NON-NLS-1$
-		URL totalURL = new URL(url, totalPath);
-		String finalFile = totalURL.getFile();
-		File file = new File(finalFile);
-		return file;
-	}
-	
-	private String createString(String directory, String filename) throws FileNotFoundException, IOException {
-		StringBuffer buf = new StringBuffer();
-		Reader fileReader = new FileReader(createFile(directory, filename));
-		BufferedReader reader = new BufferedReader(fileReader);
-		String line;
-		while ((line = reader.readLine()) != null) {
-			buf.append(line);
-			buf.append(commonEOL);
-		}
-		return buf.toString();
-	}
-	
-	private void sourceParserTest(String filename, String mode) throws IOException {
-		ICSSModel model = null;
-		if (mode.equals(MODE_OPEN)) {
-			model = readModelOpen(filename);
-		}
-		else if (mode.equals(MODE_APPEND)) {
-			model = readModelAppend(filename);
-		}
-		else if (mode.equals(MODE_INSERT)) {
-			model = readModelInsert(filename);
-		}
-		String result = dumpRegions(model.getStructuredDocument());
-		compareResult(result, "JSPedCSSSourceParserTest-" + filename); //$NON-NLS-1$
-		closeModel(model);
-	}
-
-	private ICSSModel readModelOpen(String filename) throws IOException {
-		String source = createString(FILES_DIR, filename);
-		ICSSModel model = createModel(filename.endsWith("jspf"));//$NON-NLS-1$
-		IStructuredDocument document = model.getStructuredDocument();
-		document.replaceText(null, 0, 0, source);
-
-		return model;
-	}
-
-	private ICSSModel readModelAppend(String filename) throws IOException {
-		String source = createString(FILES_DIR, filename);
-		ICSSModel model = createModel(filename.endsWith("jspf"));//$NON-NLS-1$
-		IStructuredDocument document = model.getStructuredDocument();
-		for (int i = 0; i < source.length(); i++) {
-			document.replaceText(null, i, 0, source.substring(i, i + 1));
-		}
-
-		return model;
-	}
-
-	private ICSSModel readModelInsert(String filename) throws IOException {
-		String source = createString(FILES_DIR, filename);
-		ICSSModel model = createModel(filename.endsWith("jspf"));//$NON-NLS-1$
-		IStructuredDocument document = model.getStructuredDocument();
-		for (int i = 0; i < source.length(); i++) {
-			int textIndex = source.length() - i - 1;
-			document.replaceText(null, 0, 0, source.substring(textIndex, textIndex + 1));
-		}
-
-		return model;
-	}
-
-	private void closeModel(ICSSModel model) {
-		model.releaseFromEdit();
-	}
-
-	private String dumpRegions(IStructuredDocument document) {
-		StringBuffer buf = new StringBuffer();
-		buf.append(dumpRegions(document.getFirstStructuredDocumentRegion()));
-		return buf.toString();
-	}
-
-	private String dumpRegions(IStructuredDocumentRegion region) {
-		StringBuffer buf = new StringBuffer();
-		while (region != null){
-			buf.append(dumpOneRegion(region));
-			region = region.getNext();
-		}
-
-		buf.append(commonEOL + "-------" + commonEOL); //$NON-NLS-1$
-
-		return buf.toString();
-	}
-
-	private String dumpOneRegion(IStructuredDocumentRegion documentRegion) {
-		StringBuffer buf = new StringBuffer();
-
-		buf.append(documentRegion.toString());
-		buf.append(commonEOL + "    "); //$NON-NLS-1$
-
-		ITextRegionList regionList = documentRegion.getRegions();
-		Iterator i = regionList.iterator();
-		while (i.hasNext()) {
-			ITextRegion textRegion = (ITextRegion) i.next();
-			buf.append(textRegion.toString());
-			buf.append(", "); //$NON-NLS-1$
-		}
-		buf.append(commonEOL); //$NON-NLS-1$
-		return buf.toString();
-	}
-
-	private void compareResult(String actual, String filename) throws IOException {
-		String result = createString(RESULTS_DIR, filename);
-		assertEquals(result, actual);
-	}
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jsp
deleted file mode 100644
index 1c4b700d8..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jsp
+++ /dev/null
@@ -1,13 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73, 
-[73, 143] (<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-66/70, 
-[143, 188] (<%@ include file="./cssjspfragment.jspf" %>
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-43/45, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jspf
deleted file mode 100644
index 49ab4db96..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample01.jspf
+++ /dev/null
@@ -1,9 +0,0 @@
-[0, 70] (<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-66/70, 
-[70, 115] (<%@ include file="./cssjspfragment.jspf" %>
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-43/45, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jsp
deleted file mode 100644
index 06f5e7c8b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jsp
+++ /dev/null
@@ -1,32 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73, 
-[73, 79] (.hoge )
-    ContextRegion--> SELECTOR_CLASS: 0-5/6, 
-[79, 83] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[83, 97] (float : ${XXX})
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14, 
-[97, 98] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[98, 101] (
-	)
-    ContextRegion--> S: 0-3, 
-[101, 120] (border-${XXX}-color)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13, ContextRegion--> UNKNOWN: 13-19, 
-[120, 126] ( : red)
-    ContextRegion--> S: 0-1, ContextRegion--> DECLARATION_SEPARATOR: 1-2/3, ContextRegion--> DECLARATION_VALUE_IDENT: 3-6, 
-[126, 127] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[127, 129] (
-)
-    ContextRegion--> S: 0-2, 
-[129, 130] (})
-    ContextRegion--> RBRACE: 0-1, 
-[130, 132] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jspf
deleted file mode 100644
index 6e4a6ec3a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample02.jspf
+++ /dev/null
@@ -1,32 +0,0 @@
-[0, 4] (
-
-)
-    ContextRegion--> S: 0-4, 
-[4, 10] (.hoge )
-    ContextRegion--> SELECTOR_CLASS: 0-5/6, 
-[10, 14] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[14, 28] (float : ${XXX})
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14, 
-[28, 29] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[29, 32] (
-	)
-    ContextRegion--> S: 0-3, 
-[32, 51] (border-${XXX}-color)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13, ContextRegion--> UNKNOWN: 13-19, 
-[51, 57] ( : red)
-    ContextRegion--> S: 0-1, ContextRegion--> DECLARATION_SEPARATOR: 1-2/3, ContextRegion--> DECLARATION_VALUE_IDENT: 3-6, 
-[57, 58] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[58, 60] (
-)
-    ContextRegion--> S: 0-2, 
-[60, 61] (})
-    ContextRegion--> RBRACE: 0-1, 
-[61, 63] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jsp
deleted file mode 100644
index f36aaa355..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73, 
-[73, 79] (.hoge )
-    ContextRegion--> SELECTOR_CLASS: 0-5/6, 
-[79, 83] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[83, 97] (color : ${XXX})
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14, 
-[97, 98] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[98, 101] (
-	)
-    ContextRegion--> S: 0-3, 
-[101, 126] (border-color : <%= YYY %>)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> CSS_JSP_EXP: 15-25, 
-[126, 127] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[127, 129] (
-)
-    ContextRegion--> S: 0-2, 
-[129, 130] (})
-    ContextRegion--> RBRACE: 0-1, 
-[130, 132] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jspf
deleted file mode 100644
index 29b6482c3..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample03.jspf
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 4] (
-
-)
-    ContextRegion--> S: 0-4, 
-[4, 10] (.hoge )
-    ContextRegion--> SELECTOR_CLASS: 0-5/6, 
-[10, 14] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[14, 28] (color : ${XXX})
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> FOREIGN_ELEMENT: 8-14, 
-[28, 29] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[29, 32] (
-	)
-    ContextRegion--> S: 0-3, 
-[32, 57] (border-color : <%= YYY %>)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> CSS_JSP_EXP: 15-25, 
-[57, 58] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[58, 60] (
-)
-    ContextRegion--> S: 0-2, 
-[60, 61] (})
-    ContextRegion--> RBRACE: 0-1, 
-[61, 63] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jsp
deleted file mode 100644
index cf760e600..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jsp
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73, 
-[73, 79] (.puge )
-    ContextRegion--> SELECTOR_CLASS: 0-5/6, 
-[79, 83] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[83, 89] (${XXX})
-    ContextRegion--> FOREIGN_ELEMENT: 0-6, 
-[89, 90] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[90, 93] (
-	)
-    ContextRegion--> S: 0-3, 
-[93, 111] (border-color : red)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-18, 
-[111, 112] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[112, 114] (
-)
-    ContextRegion--> S: 0-2, 
-[114, 115] (})
-    ContextRegion--> RBRACE: 0-1, 
-[115, 117] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jspf
deleted file mode 100644
index 1d40579d3..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample04.jspf
+++ /dev/null
@@ -1,26 +0,0 @@
-[0, 6] (.puge )
-    ContextRegion--> SELECTOR_CLASS: 0-5/6, 
-[6, 10] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[10, 16] (${XXX})
-    ContextRegion--> FOREIGN_ELEMENT: 0-6, 
-[16, 17] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[17, 20] (
-	)
-    ContextRegion--> S: 0-3, 
-[20, 38] (border-color : red)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-18, 
-[38, 39] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[39, 41] (
-)
-    ContextRegion--> S: 0-2, 
-[41, 42] (})
-    ContextRegion--> RBRACE: 0-1, 
-[42, 44] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jsp
deleted file mode 100644
index ddd99933b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-[0, 71] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/71, 
-[71, 100] (<%-- 
-jsp 
-comment 
---%>
-)
-    ContextRegion--> COMMENT: 0-27/29, 
-[100, 103] (H1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3, 
-[103, 107] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[107, 130] (background-color : blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_IDENT: 19-23, 
-[130, 131] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[131, 133] (
-)
-    ContextRegion--> S: 0-2, 
-[133, 134] (})
-    ContextRegion--> RBRACE: 0-1, 
-[134, 136] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jspf
deleted file mode 100644
index 83fff303b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample05.jspf
+++ /dev/null
@@ -1,26 +0,0 @@
-[0, 31] (
-<%-- 
-jsp 
-comment 
---%>
-)
-    ContextRegion--> S: 0-2, ContextRegion--> COMMENT: 2-29/31, 
-[31, 34] (H1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3, 
-[34, 38] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[38, 61] (background-color : blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_IDENT: 19-23, 
-[61, 62] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[62, 64] (
-)
-    ContextRegion--> S: 0-2, 
-[64, 65] (})
-    ContextRegion--> RBRACE: 0-1, 
-[65, 67] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jsp
deleted file mode 100644
index 23ac7c0e1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-[0, 73] (<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-)
-    ContextRegion--> CSS_JSP_DIRECTIVE: 0-69/73, 
-[73, 76] (H1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3, 
-[76, 80] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[80, 111] (border-${XXX} : 0px, solid, red)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_IDENT: 21-26, ContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, ContextRegion--> DECLARATION_VALUE_IDENT: 28-31, 
-[111, 112] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[112, 114] (
-)
-    ContextRegion--> S: 0-2, 
-[114, 115] (})
-    ContextRegion--> RBRACE: 0-1, 
-[115, 117] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jspf
deleted file mode 100644
index 671d71d32..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample06.jspf
+++ /dev/null
@@ -1,23 +0,0 @@
-[0, 4] (
-
-)
-    ContextRegion--> S: 0-4, 
-[4, 7] (H1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3, 
-[7, 11] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[11, 42] (border-${XXX} : 0px, solid, red)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> FOREIGN_ELEMENT: 7-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_IDENT: 21-26, ContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, ContextRegion--> DECLARATION_VALUE_IDENT: 28-31, 
-[42, 43] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[43, 45] (
-)
-    ContextRegion--> S: 0-2, 
-[45, 46] (})
-    ContextRegion--> RBRACE: 0-1, 
-[46, 48] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jsp
deleted file mode 100644
index c2678fb63..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jspf
deleted file mode 100644
index de5f2acbb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/results/JSPedCSSSourceParserTest-sample07.jspf
+++ /dev/null
@@ -1,2 +0,0 @@
-
--------
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jsp
deleted file mode 100644
index 19723c594..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-<%@ include file="./cssjspfragment.jspf" %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jspf
deleted file mode 100644
index a86aee580..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample01.jspf
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c-rt" %>
-
-<%@ include file="./cssjspfragment.jspf" %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jsp
deleted file mode 100644
index b00d5b45e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-.hoge {
-	float : ${XXX};
-	border-${XXX}-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jspf
deleted file mode 100644
index 238ad9ee1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample02.jspf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-.hoge {
-	float : ${XXX};
-	border-${XXX}-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jsp
deleted file mode 100644
index 38ddb8cad..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-.hoge {
-	color : ${XXX};
-	border-color : <%= YYY %>;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jspf
deleted file mode 100644
index 5e638360e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample03.jspf
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-.hoge {
-	color : ${XXX};
-	border-color : <%= YYY %>;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jsp
deleted file mode 100644
index 18709a8b0..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-.puge {
-	${XXX};
-	border-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jspf
deleted file mode 100644
index 4f03d5a57..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample04.jspf
+++ /dev/null
@@ -1,4 +0,0 @@
-.puge {
-	${XXX};
-	border-color : red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jsp
deleted file mode 100644
index 2e39e577e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-<%-- 
-jsp 
-comment 
---%>
-H1 {
-	background-color : blue;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jspf
deleted file mode 100644
index e98a25199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample05.jspf
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<%-- 
-jsp 
-comment 
---%>
-H1 {
-	background-color : blue;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jsp
deleted file mode 100644
index 01b344e6f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page session="false" contentType="text/css;charset=ISO-8859-1" %>
-
-H1 {
-	border-${XXX} : 0px, solid, red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jspf
deleted file mode 100644
index 0216ce5fb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample06.jspf
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-H1 {
-	border-${XXX} : 0px, solid, red;
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jsp b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jsp
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jspf b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jspf
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/css/core/tests/testfiles/sample07.jspf
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/test.xml b/tests/org.eclipse.jst.jsp.core.tests/test.xml
deleted file mode 100644
index 99c433120..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-    
-    <property
-        name="plugin-name"
-        value="org.eclipse.jst.jsp.core.tests" />
-    <property
-        name="classname"
-        value="org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite" />
-    <property
-        name="testType"
-        value="core-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld
deleted file mode 100644
index bfdd67375..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/116066/tagdep.tld
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version = "1.0" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglib_1_2.dtd">
-<taglib>
-	<tlib-version>1.1</tlib-version>
-	<jsp-version>1.1</jsp-version>
-	<uri>tagdependent</uri>
-	<short-name>tagdependent</short-name>
-	<description>
-		This tag library demonstrates tagdependent tag handling
-		using its "code" tag.
-	</description>
-	<tag>
-		<name>code</name>
-		<tag-class>com.example.tagdep.CodeTag</tag-class>
-		<body-content>tagdependent</body-content>
-		<attribute>
-			<name>fontName</name>
-			<required>true</required>
-			<type>java.lang.String</type>
-		</attribute>
-		<attribute>
-			<name>bold</name>
-			<type>boolean</type>
-		</attribute>
-		<attribute>
-			<name>italic</name>
-			<type>boolean</type>
-		</attribute>
-	</tag>
-	<small-icon>browser_editor.gif</small-icon>
-</taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.project
deleted file mode 100644
index a37562449..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_107338</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/web.xml
deleted file mode 100644
index d03194ce9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>107338</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/test107338.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/test107338.jsp
deleted file mode 100644
index 060f5d1b2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/WebContent/test107338.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<script>
-<%
-  int i = 0;
-%><%=i%><%
- 
-%>
-</script>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_107338/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project
deleted file mode 100644
index 2a08dbaa7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_118251-e</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
-     <tlibversion>0.0.1</tlibversion>
-     <jspversion>1.2</jspversion>
-     <shortname>sample</shortname>
-     <uri>http://example.com/sample2_for_118251-e</uri>
-     <info>
-        This tag library contains just one tag.  Ha ha! 
-     </info>
-
-     <tag>
-       <name>code</name>
-       <tagclass>sample.taglib.CodeTag</tagclass>
-       <bodycontent>tagdependent</bodycontent>
-       <attribute>
-         <name>fontAttributes</name>
-       </attribute>
-       <attribute>
-         <name>commentColor</name>
-       </attribute>
-       <attribute>
-         <name>stringColor</name>
-       </attribute>
-     </tag>
-   </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml
deleted file mode 100644
index f31e57857..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath
deleted file mode 100644
index 0a9f2ba0a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project
deleted file mode 100644
index 22e550ecb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_118251-f</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
-     <tlibversion>0.0.1</tlibversion>
-     <jspversion>1.2</jspversion>
-     <shortname>sample</shortname>
-     <uri>http://example.com/sample2_for_118251-e</uri>
-     <info>
-        This tag library contains just one tag.  Ha ha! 
-     </info>
-
-     <tag>
-       <name>code</name>
-       <tagclass>sample.taglib.CodeTag</tagclass>
-       <bodycontent>tagdependent</bodycontent>
-       <attribute>
-         <name>fontAttributes</name>
-       </attribute>
-       <attribute>
-         <name>commentColor</name>
-       </attribute>
-       <attribute>
-         <name>stringColor</name>
-       </attribute>
-     </tag>
-   </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-f/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath
deleted file mode 100644
index 1d5f5d40c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="Web Content/WEB-INF/lib/sample_tld.jar"/>
-	<classpathentry kind="output" path="Web Content/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project
deleted file mode 100644
index 5041b27e9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_118251-g</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
-     <tlibversion>0.0.1</tlibversion>
-     <jspversion>1.2</jspversion>
-     <shortname>sample</shortname>
-     <uri>http://example.com/sample2_for_118251-e</uri>
-     <info>
-        This tag library contains just one tag.  Ha ha! 
-     </info>
-
-     <tag>
-       <name>code</name>
-       <tagclass>sample.taglib.CodeTag</tagclass>
-       <bodycontent>tagdependent</bodycontent>
-       <attribute>
-         <name>fontAttributes</name>
-       </attribute>
-       <attribute>
-         <name>commentColor</name>
-       </attribute>
-       <attribute>
-         <name>stringColor</name>
-       </attribute>
-     </tag>
-   </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/Web Content/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-g/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt
deleted file mode 100644
index 48030320d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-sample/sample_tld.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The accompanying jar contains a TLD with a URI specified in
-it as well as a big long file that should slow down the
-taglib indexing.
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project
deleted file mode 100644
index ac7bfe413..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_148717</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 76ed56f40..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="bug_148717">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="bug_148717"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c5c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="Apache Tomcat v5.5.9"/>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.java" version="5.0"/>
-  <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jar
deleted file mode 100644
index ebad27b52..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/lib/internal.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 18536698d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_c" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>prj119576_c</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-		<taglib-uri>http://example.com/external-uri</taglib-uri>
-		<taglib-location>/WEB-INF/lib/internal.jar</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_148717/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project
deleted file mode 100644
index e3720e751..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_87351</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml
deleted file mode 100644
index bf80a5beb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>bug_87351</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf
deleted file mode 100644
index 3baff4b7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/WebContent/ihaveerrors.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<% String this is broken %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_87351/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project
deleted file mode 100644
index 6225fab7d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>prj119576_a</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15d4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c5c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="Apache Tomcat v5.5.9"/>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.java" version="5.0"/>
-  <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml
deleted file mode 100644
index af232736b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_a" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>prj119576_a</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp
deleted file mode 100644
index 379a44c94..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "header.jsp" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp
deleted file mode 100644
index 55549b4dc..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body1.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "taglib.jspf" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp
deleted file mode 100644
index 58db5bdca..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/body2.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ include file = "body.jsp" %>
-<%@ include file = "body1.jsp" %>
-<sample:code/>
-<% java.util.Date bodyDate = headerDate; %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp
deleted file mode 100644
index a539fd633..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/header.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<% java.util.Date headerDate = null; %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf
deleted file mode 100644
index 6c2d86f1e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/taglib.jspf
+++ /dev/null
@@ -1 +0,0 @@
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp
deleted file mode 100644
index 4cdb54229..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/WebContent/test1.jsp
+++ /dev/null
@@ -1,12 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-<%="Hello, World!"%>
-</body>
-</html>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_a/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project
deleted file mode 100644
index 6225fab7d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>prj119576_a</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15d4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c5c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="Apache Tomcat v5.5.9"/>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.java" version="5.0"/>
-  <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 0ba8bed92..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_b" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>prj119576_b</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp
deleted file mode 100644
index 379a44c94..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body1.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ include file = "header.jsp" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp
deleted file mode 100644
index 828d2409d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/body3.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@include file = "body1.jsp" %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp
deleted file mode 100644
index eecf27e29..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/WebContent/header.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %>
-<% java.util.Date headerDate = null; %>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_b/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath
deleted file mode 100644
index cc2ae4242..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jst.server.core.container"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project
deleted file mode 100644
index 349f4b235..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.project
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>prj119576_c</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index fe8bc9f7c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon May 01 13:41:18 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.4
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index ffc01295b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon May 01 13:41:24 EDT 2006
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:1.5.0_03/owners=jst.java\:5.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v5.5.9/owners=jst.web\:2.4
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 8ee0c15d4..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-<wb-module deploy-name="CleanTestWeb">
-<wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-<property name="context-root" value="CleanTestWeb"/>
-<property name="java-output-path" value="build/classes"/>
-</wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 39b9b4c5c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="Apache Tomcat v5.5.9"/>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.java" version="5.0"/>
-  <installed facet="jst.web" version="2.4"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar
deleted file mode 100644
index 1a98c4199..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/lib/sample_tld.jar
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 73560f865..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="prj119576_c" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>prj119576_c</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp
deleted file mode 100644
index 6aa228952..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body1.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@ include file = "header.jsp" %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp
deleted file mode 100644
index 71c73cf10..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/body3.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%@include file = "body1.jsp" %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp
deleted file mode 100644
index 503c7a0b9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/WebContent/header.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-pageEncoding="ISO-8859-1"%>
-<%@taglib uri="http://example.com/sample-taglib" prefix="sample" %>
-<% java.util.Date headerDate = null; %>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/bin/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/build/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/prj119576_c/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath
deleted file mode 100644
index 8d5f4fb88..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" exported="false" kind="src" path="/testavailable2"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project
deleted file mode 100644
index 5baaadda7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testavailable1</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable1/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath
deleted file mode 100644
index 0a9f2ba0a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project
deleted file mode 100644
index 5baaadda7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testavailable1</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testavailable2/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath
deleted file mode 100644
index 0a9f2ba0a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/sample_tld.jar"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project
deleted file mode 100644
index a335f6a37..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testcache1</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
-     <tlibversion>0.0.1</tlibversion>
-     <jspversion>1.2</jspversion>
-     <shortname>sample</shortname>
-     <uri>http://example.com/sample2_for_118251-e</uri>
-     <info>
-        This tag library contains just one tag.  Ha ha! 
-     </info>
-
-     <tag>
-       <name>code</name>
-       <tagclass>sample.taglib.CodeTag</tagclass>
-       <bodycontent>tagdependent</bodycontent>
-       <attribute>
-         <name>fontAttributes</name>
-       </attribute>
-       <attribute>
-         <name>commentColor</name>
-       </attribute>
-       <attribute>
-         <name>stringColor</name>
-       </attribute>
-     </tag>
-   </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache1/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath
deleted file mode 100644
index 5ec3b3b66..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project
deleted file mode 100644
index 274293f5a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testcache2</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/classes/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
deleted file mode 100644
index 04f9bc513..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/tld/sample2_for_118251-e.tld
+++ /dev/null
@@ -1,25 +0,0 @@
-<taglib>
-
-     <tlibversion>0.0.1</tlibversion>
-     <jspversion>1.2</jspversion>
-     <shortname>sample</shortname>
-     <uri>http://example.com/sample2_for_118251-e</uri>
-     <info>
-        This tag library contains just one tag.  Ha ha! 
-     </info>
-
-     <tag>
-       <name>code</name>
-       <tagclass>sample.taglib.CodeTag</tagclass>
-       <bodycontent>tagdependent</bodycontent>
-       <attribute>
-         <name>fontAttributes</name>
-       </attribute>
-       <attribute>
-         <name>commentColor</name>
-       </attribute>
-       <attribute>
-         <name>stringColor</name>
-       </attribute>
-     </tag>
-   </taglib>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml
deleted file mode 100644
index a3d07f0f2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-	<display-name>
-	test1</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>default.html</welcome-file>
-		<welcome-file>default.htm</welcome-file>
-		<welcome-file>default.jsp</welcome-file>
-	</welcome-file-list>
-	<taglib>
-	  <taglib-uri>/tags/sample2</taglib-uri>
-	  <taglib-location>/WEB-INF/tld/sample2_for_118251-e.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp
deleted file mode 100644
index 2be00cd4d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/WebContent/test1.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<%@taglib uri="http://java.sun.com/jsf/core" prefix="c"%>
-<%@taglib prefix="sample" uri="http://example.com/sample-taglib" %>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-
-<sample:code> asdgjalskjga  << </sample:code>
-
-<c:out value=""></c:out>
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/testcache2/src/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.classpath b/tests/org.eclipse.jst.jsp.tests.encoding/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore b/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
deleted file mode 100644
index bf82c7f00..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-jspencodingtests.jar
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.project b/tests/org.eclipse.jst.jsp.tests.encoding/.project
deleted file mode 100644
index 8ea61d693..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsp.tests.encoding</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.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index 61275fe9d..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.jsp.tests.encoding
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: jspencodingtests.jar
-Bundle-Activator: org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.jsp.tests.encoding,
- org.eclipse.jst.jsp.tests.encoding.jsp
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.xml.core,
- org.junit,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.tests.encoding
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/about.html b/tests/org.eclipse.jst.jsp.tests.encoding/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.jst.jsp.tests.encoding/build.properties b/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
deleted file mode 100644
index 34304b536..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.jspencodingtests.jar = src/
-output.jspencodingtests.jar = bin/
-bin.includes = jspencodingtests.jar,\
-               testfiles/,\
-               test.xml,\
-               META-INF/,\
-               about.html
-src.includes = testfiles/,\
-               test.xml,\
-               META-INF/
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties b/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties
deleted file mode 100644
index 98b1b7f4c..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.jst.jsp.tests.encoding
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JSP Encoding Tests Plug-in
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
deleted file mode 100644
index 87cfaa3f0..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +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.jst.jsp.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPEncodingTests;
-import org.eclipse.jst.jsp.tests.encoding.jsp.JSPHeadTokenizerTester;
-import org.eclipse.jst.jsp.tests.encoding.jsp.TestContentTypeDetectionForJSP;
-
-public class JSPEncodingTestSuite extends TestSuite {
-
-	private static Class[] classes = new Class[]{JSPEncodingTests.class, JSPHeadTokenizerTester.class, TestContentTypeDetectionForJSP.class};
-
-	public static Test suite() {
-		return new JSPEncodingTestSuite();
-	}
-
-	public JSPEncodingTestSuite() {
-		super("JSP Encoding Test Suite");
-		for (int i = 0; i < classes.length; i++) {
-			addTest(new TestSuite(classes[i], classes[i].getName()));
-		}
-	}
-
-	/**
-	 * @param theClass
-	 */
-	public JSPEncodingTestSuite(Class theClass) {
-		super(theClass);
-	}
-
-	/**
-	 * @param theClass
-	 * @param name
-	 */
-	public JSPEncodingTestSuite(Class theClass, String name) {
-		super(theClass, name);
-	}
-
-	/**
-	 * @param name
-	 */
-	public JSPEncodingTestSuite(String name) {
-		super(name);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
deleted file mode 100644
index 18e0c6873..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/JSPEncodingTestsPlugin.java
+++ /dev/null
@@ -1,142 +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.jst.jsp.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-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 JSPEncodingTestsPlugin extends Plugin {
-	// The shared instance.
-	private static JSPEncodingTestsPlugin plugin;
-
-	public static List getAllTestFiles(String topDirName) {
-		List result = null;
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + topDirName;
-		File topDir = new File(location);
-		if (!topDir.isDirectory()) {
-			throw new IllegalArgumentException(topDirName + " is not a directory");
-		}
-
-		result = getFilesInDir(topDir);
-		return result;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static JSPEncodingTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	private static List getFilesInDir(File topDir) {
-		List files = new ArrayList();
-		File[] topFiles = topDir.listFiles();
-		for (int i = 0; i < topFiles.length; i++) {
-			File file = topFiles[i];
-			if (file.isFile()) {
-				files.add(file);
-			}
-			else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
-				List innerFiles = getFilesInDir(file);
-				files.addAll(innerFiles);
-			}
-		}
-		return files;
-	}
-
-	public static URL getInstallLocation() {
-		URL installLocation = Platform.getBundle("org.eclipse.jst.jsp.tests.encoding").getEntry("/");
-		URL resolvedLocation = null;
-		try {
-			resolvedLocation = FileLocator.resolve(installLocation);
-		}
-		catch (IOException e) {
-			// impossible
-			throw new Error(e);
-		}
-		return resolvedLocation;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = JSPEncodingTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null ? bundle.getString(key) : key);
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	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;
-	}
-
-	public static Reader getTestReader(String filepath) throws FileNotFoundException {
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		Reader result = new FileReader(location);
-		return result;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public JSPEncodingTestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return null;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
deleted file mode 100644
index bed934f5c..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPEncodingTests.java
+++ /dev/null
@@ -1,182 +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.jst.jsp.tests.encoding.jsp;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPResourceEncodingDetector;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class JSPEncodingTests extends TestCase {
-
-	/**
-	 * Ensures that an InputStream has mark/reset support.
-	 */
-	private static InputStream getMarkSupportedStream(InputStream original) {
-		if (original == null)
-			return null;
-		if (original.markSupported())
-			return original;
-		return new BufferedInputStream(original);
-	}
-	private boolean DEBUG = false;
-	private final String fileDir = "jsp/";
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
-	private int READ_BUFFER_SIZE = 8000;
-
-	public JSPEncodingTests(String name) {
-		super(name);
-	}
-
-	private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
-		File file = JSPEncodingTestsPlugin.getTestFile(filename);
-		if (!file.exists())
-			throw new IllegalArgumentException(filename + " was not found");
-		InputStream inputStream = new FileInputStream(file);
-		// InputStream inStream = getClass().getResourceAsStream(filename);
-		InputStream istream = getMarkSupportedStream(inputStream);
-		try {
-			detector.set(istream);
-			EncodingMemento encodingMemento = ((JSPResourceEncodingDetector)detector).getEncodingMemento();
-			String foundIANAEncoding = encodingMemento.getJavaCharsetName();
-			// I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
-			// since
-			// some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
-			// We do want to be tolerant on input, and accept either, but I
-			// think
-			// that SupportedJavaEncodings needs to be changed to "recommend"
-			// Shift_JIS.
-			boolean expectedIANAResult = false;
-			expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-
-			assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
-			// a very simple read test ... will cause JUnit error (not fail)
-			// if throws exception.
-			ensureCanRead(filename, foundIANAEncoding, istream);
-		}
-		finally {
-			if (istream != null) {
-				istream.close();
-			}
-			if (inputStream != null) {
-				inputStream.close();
-			}
-		}
-	}
-
-	/**
-	 * This method just reads to stream, to be sure it can be read per
-	 * encoding, without exception.
-	 */
-	private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
-		Charset charset = Charset.forName(encoding);
-		CharsetDecoder charsetDecoder = charset.newDecoder();
-		charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
-		charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
-		InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
-		StringBuffer stringBuffer = readInputStream(reader);
-		if (DEBUG) {
-			System.out.println();
-			System.out.println(filename);
-			System.out.println(stringBuffer.toString());
-		}
-	}
-
-	private StringBuffer readInputStream(Reader reader) throws IOException {
-
-		StringBuffer buffer = new StringBuffer();
-		int numRead = 0;
-		char tBuff[] = new char[READ_BUFFER_SIZE];
-		while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
-			buffer.append(tBuff, 0, numRead);
-		}
-		return buffer;
-	}
-
-	public void testdefect4205wpsjsp() throws IOException {
-		String filename = fileLocation + "defect_4205_wps.jsp";
-		doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
-	}
-
-	public void testJSPEmptyFile() throws IOException {
-		String filename = fileLocation + "EmptyFile.jsp";
-		doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
-	}
-
-	/**
-	 * Caution, when this file prints out in console (when debug set to true,
-	 * it appears incorrect (due to font problems in console).
-	 */
-	public void testUTF16() throws IOException {
-		String filename = fileLocation + "testUTF16.jsp";
-		doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
-	}
-
-	/**
-	 * This test shows unicode BOM should take priority over settings/defaults
-	 */
-	public void testUtf16UnicodeStreamWithNoEncodingInHeader() throws IOException {
-		String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeader2.jsp";
-		doTestFileStream(filename, "UTF-16", new JSPResourceEncodingDetector());
-	}
-
-	/**
-	 * This test shows unicode BOM should take priority over settings/defaults
-	 * Note: UTF-16 == UTF-16BE
-	 */
-	public void testUtf16UnicodeStreamWithNoEncodingInHeaderBE() throws IOException {
-		String filename = fileLocation + "utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp";
-		doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
-	}
-
-	public void testUTF16WithJapaneseChars() throws IOException {
-		String filename = fileLocation + "utf16WithJapaneseChars.jsp";
-		doTestFileStream(filename, "UTF-16BE", new JSPResourceEncodingDetector());
-	}
-
-	public void testUTF83ByteBOM() throws IOException {
-		String filename = fileLocation + "UTF8With3ByteBOM.jsp";
-		doTestFileStream(filename, "UTF-8", new JSPResourceEncodingDetector());
-	}
-
-	public void testXMLIllformedNormalNonDefault() throws IOException {
-		String filename = fileLocation + "IllformedNormalNonDefault.jsp";
-		String ianaInFile = "ISO-8859-8";
-		doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
-	}
-
-	public void testXMLNoEncoding() throws IOException {
-		String filename = fileLocation + "noEncoding.jsp";
-		doTestFileStream(filename, "ISO-8859-1", new JSPResourceEncodingDetector());
-	}
-
-	public void testXMLNormalNonDefault() throws IOException {
-		String filename = fileLocation + "NormalNonDefault.jsp";
-		String ianaInFile = "ISO-8859-8";
-		doTestFileStream(filename, ianaInFile, new JSPResourceEncodingDetector());
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
deleted file mode 100644
index 4cb3db87f..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/JSPHeadTokenizerTester.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contenttype.HeadParserToken;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizer;
-import org.eclipse.jst.jsp.core.internal.contenttype.JSPHeadTokenizerConstants;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestsPlugin;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-import org.eclipse.wst.xml.core.internal.contenttype.XMLHeadTokenizerConstants;
-
-public class JSPHeadTokenizerTester extends TestCase {
-	private boolean DEBUG = false;
-	private String fCharset;
-	private String fContentType;
-	private String fContentTypeValue;
-	private final String fileDir = "jsp/";
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
-	private String fPageEncodingValue = null;
-	private String fXMLDecEncodingName;
-	private String fLanguage;
-
-	private void doTestFile(String filename, String expectedName) throws IOException {
-		doTestFile(filename, expectedName, null, null);
-	}
-
-	private void doTestFile(String filename, String expectedName, String finalTokenType, String expectedContentType) throws IOException {
-		JSPHeadTokenizer tokenizer = null;
-		Reader fileReader = null;
-		try {
-			if (DEBUG) {
-				System.out.println();
-				System.out.println("       " + filename);
-				System.out.println();
-			}
-			fileReader = JSPEncodingTestsPlugin.getTestReader(filename);
-			tokenizer = new JSPHeadTokenizer(fileReader);
-		}
-		catch (IOException e) {
-			System.out.println("Error opening file \"" + filename + "\"");
-		}
-
-		HeadParserToken token = parseHeader(tokenizer);
-		String resultValue = getAppropriateEncoding();
-		fileReader.close();
-		if (finalTokenType != null) {
-			assertTrue("did not end as expected. found:  " + token.getType(), finalTokenType.equals(token.getType()));
-		}
-
-		if (expectedName == null) {
-			assertTrue("expected no encoding, but found: " + resultValue, resultValue == null);
-		}
-		else {
-			assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
-		}
-
-		String foundContentType = getContentType();
-		if (expectedContentType == null) {
-			assertTrue("expected no contentType, but found: " + foundContentType, foundContentType == null);
-		}
-		else {
-			assertTrue("expected " + expectedContentType + " but found " + foundContentType, expectedContentType.equals(foundContentType));
-		}
-
-	}
-
-	// public void testMalformedNoEncoding() {
-	// String filename = fileLocation + "MalformedNoEncoding.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testMalformedNoEncodingXSL() {
-	// String filename = fileLocation + "MalformedNoEncodingXSL.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testNoEncoding() {
-	// String filename = fileLocation + "NoEncoding.jsp";
-	// doTestFile(filename);
-	// }
-	public void testNormalNonDefault() throws IOException {
-		String filename = fileLocation + "NormalNonDefault.jsp";
-		doTestFile(filename, "ISO-8859-8");
-	}
-
-	// public void testNormalPageCaseNonDefault() {
-	// String filename = fileLocation + "NormalPageCaseNonDefault.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testdefect223365() {
-	// String filename = fileLocation + "SelColBeanRow12ResultsForm.jsp";
-	// doTestFile(filename);
-	// }
-	/**
-	 * returns encoding according to priority: 1. XML Declaration 2. page
-	 * directive pageEncoding name 3. page directive contentType charset name
-	 */
-	private String getAppropriateEncoding() {
-		String result = null;
-		if (fXMLDecEncodingName != null)
-			result = fXMLDecEncodingName;
-		else if (fPageEncodingValue != null)
-			result = fPageEncodingValue;
-		else if (fCharset != null)
-			result = fCharset;
-		return result;
-	}
-
-	private String getContentType() {
-		return fContentType;
-	}
-
-	private boolean isLegalString(String tokenType) {
-		boolean result = false;
-		if (tokenType != null) {
-			result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
-		}
-		return result;
-	}
-
-	/**
-	 * This method should be exactly the same as what is in
-	 * JSPResourceEncodingDetector
-	 * 
-	 * @param contentType
-	 */
-	private void parseContentTypeValue(String contentType) {
-		Pattern pattern = Pattern.compile(";\\s*charset\\s*=\\s*"); //$NON-NLS-1$
-		String[] parts = pattern.split(contentType);
-		if (parts.length > 0) {
-			// if only one item, it can still be charset instead of
-			// contentType
-			if (parts.length == 1) {
-				if (parts[0].length() > 6) {
-					String checkForCharset = parts[0].substring(0, 7);
-					if (checkForCharset.equalsIgnoreCase("charset")) {
-						int eqpos = parts[0].indexOf('=');
-						eqpos = eqpos + 1;
-						if (eqpos < parts[0].length()) {
-							fCharset = parts[0].substring(eqpos);
-							fCharset = fCharset.trim();
-						}
-					}
-					else {
-						fContentType = parts[0];
-					}
-				}
-			}
-			else {
-				fContentType = parts[0];
-			}
-		}
-		if (parts.length > 1) {
-			fCharset = parts[1];
-		}
-	}
-
-	/**
-	 * Give's priority to encoding value, if found else, looks for contentType
-	 * value;
-	 */
-	private HeadParserToken parseHeader(JSPHeadTokenizer tokenizer) throws IOException {
-		fPageEncodingValue = null;
-		fCharset = null;
-		fContentType = null;
-		HeadParserToken token = null;
-		HeadParserToken finalToken = null;
-		do {
-			token = tokenizer.getNextToken();
-			String tokenType = token.getType();
-
-			if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fXMLDecEncodingName = valueToken.getText();
-					}
-				}
-			}
-			else if (tokenType == JSPHeadTokenizerConstants.PageEncoding) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fPageEncodingValue = valueToken.getText();
-					}
-				}
-			}
-			else if (tokenType == JSPHeadTokenizerConstants.PageContentType) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fContentTypeValue = valueToken.getText();
-					}
-				}
-			}
-			else if (tokenType == JSPHeadTokenizerConstants.PageLanguage) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						fLanguage = valueToken.getText();
-					}
-				}
-			}
-		}
-		while (tokenizer.hasMoreTokens());
-		if (fContentTypeValue != null) {
-			parseContentTypeValue(fContentTypeValue);
-		}
-		finalToken = token;
-		return finalToken;
-	}
-
-	public void testBestCase() throws IOException {
-		String filename = fileLocation + "nomalDirectiveCase.jsp";
-		doTestFile(filename, "ISO-8859-2", null, "text/html");
-	}
-
-	public void testMinimalPageDirective() throws IOException {
-		String filename = fileLocation + "minimalPageDirective.jsp";
-		doTestFile(filename, null, null, "text/html");
-	}
-
-	public void testIllFormed() throws IOException {
-		String filename = fileLocation + "testIllFormed.jsp";
-		doTestFile(filename, null);
-	}
-
-	public void testIllFormed2() throws IOException {
-		String filename = fileLocation + "testIllFormed2.jsp";
-		doTestFile(filename, "UTF-8");
-	}
-
-	public void testIllformedNormalNonDefault() throws IOException {
-		String filename = fileLocation + "IllformedNormalNonDefault.jsp";
-		doTestFile(filename, "ISO-8859-8", null, "text/html");
-	}
-
-	public void testEmptyFile() throws IOException {
-		String filename = fileLocation + "EmptyFile.jsp";
-		doTestFile(filename, null);
-	}
-
-	public void testNomalDirectiveCaseUsingXMLSyntax() throws IOException {
-		String filename = fileLocation + "nomalDirectiveCaseUsingXMLSyntax.jsp";
-		doTestFile(filename, "ISO-8859-2", null, "text/html");
-	}
-
-	public void testNoPageDirective() throws IOException {
-		String filename = fileLocation + "testNoPageDirective.jsp";
-		doTestFile(filename, null);
-	}
-
-	public void testNormalPageDirectiveWithXMLDecl() throws IOException {
-		String filename = fileLocation + "nomalDirectiveCasewithXMLDecl.jsp";
-		doTestFile(filename, "ISO-8859-1", null, "text/html");
-	}
-
-
-	public void testNoPageDirectiveAtFirst() throws IOException {
-		String filename = fileLocation + "testNoPageDirectiveAtFirst.jsp";
-		doTestFile(filename, "ISO-8859-2", null, "text/html");
-	}
-
-	public void testNoPageDirectiveInLargeFile() throws IOException {
-		String filename = fileLocation + "testNoPageDirectiveInLargeFile.jsp";
-		doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED, null);
-	}
-
-	public void testNormalCaseWithNeither() throws IOException {
-		String filename = fileLocation + "nomalDirectiveCaseNoEncoding.jsp";
-		doTestFile(filename, null);
-	}
-
-	public void testNormalCharset() throws IOException {
-		String filename = fileLocation + "nomalDirectiveCaseUsingCharset.jsp";
-		doTestFile(filename, "ISO-8859-3", null, "text/html");
-	}
-
-	public String getLanguage() {
-		return fLanguage;
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java b/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
deleted file mode 100644
index ae113dbd2..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/src/org/eclipse/jst/jsp/tests/encoding/jsp/TestContentTypeDetectionForJSP.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.jst.jsp.tests.encoding.jsp;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.jst.jsp.core.internal.provisional.contenttype.IContentDescriptionForJSP;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForJSP extends TestContentTypeDetection {
-
-	protected void doTest(String expectedContentType, String filePath, Class expectedException, String expectedJSPContentType) throws CoreException, IOException {
-		super.doTest(expectedContentType, filePath, expectedException);
-		
-		IFile file = (IFile) getTestProject().findMember(filePath);
-		assertNotNull("Error in test case: file not found: " + filePath, file);
-
-
-		IContentDescription streamContentDescription = doGetContentTypeBasedOnStream(file);
-		IContentDescription fileContentDescription = doGetContentTypeBasedOnFile(file);
-
-		String streamJSPContentType = (String) streamContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
-
-		checkResults(expectedJSPContentType, streamJSPContentType);
-		
-		
-		String fileJSPContentType = (String) fileContentDescription.getProperty(IContentDescriptionForJSP.CONTENT_TYPE_ATTRIBUTE);
-		checkResults(expectedJSPContentType, fileJSPContentType);
-
-
-	}
-
-	private void checkResults(String expectedJSPContentType, String foundJSPContentType) {
-		if (expectedJSPContentType == null) {
-			assertTrue("expected no contentType, but found: " + foundJSPContentType, foundJSPContentType == null);
-		}
-		else {
-			assertTrue("expected " + expectedJSPContentType + " but found " + foundJSPContentType, expectedJSPContentType.equals(foundJSPContentType));
-		}
-	}
-	
-	public void testFile100() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", null, "text/html");
-	}
-
-	public void testFile101() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", null, "text/html");
-	}
-
-	public void testFile102() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect229667/audi.jsp", null, "text/html");
-	}
-
-	public void testFile65() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/EmptyFile.jsp", null, null);
-	}
-
-	public void testFile66() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/IllformedNormalNonDefault.jsp", null, "text/html");
-	}
-
-	public void testFile67() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/inValidEncodingValue.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class);
-	}
-
-	public void testFile68() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/javaEncodingValue.jsp", null, "text/html");
-	}
-
-	public void testFile69() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncoding.jsp", null, null);
-	}
-
-	public void testFile70() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/MalformedNoEncodingXSL.jsp", null, null);
-	}
-
-	public void testFile71() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/noEncoding.jsp", null, "text/html");
-	}
-
-	public void testFile72() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NoEncodinginXMLDecl.jsp", null, null);
-	}
-
-	public void testFile73() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCase.jsp", null, "text/html");
-	}
-
-	public void testFile74() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", null, null);
-	}
-
-	public void testFile75() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", null, "text/html");
-	}
-
-	public void testFile76() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", null, "text/html");
-	}
-
-	public void testFile77() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefault.jsp", null, null);
-	}
-
-	public void testFile78() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", null, "text/html");
-	}
-	public void nomalDirectiveCasewithXMLDecl() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp", null, "text/html");
-	}
-	public void testFile79() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/NormalPageCaseNonDefault.jsp", null, "text/html");
-	}
-
-	public void testFile80() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/SelColBeanRow12ResultsForm.jsp", null, "text/html");
-	}
-
-	public void testFile81() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testBrokenLine.jsp", null, null);
-	}
-
-	public void testFile82() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncoding.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
-	}
-
-	public void testFile83() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testDefaultEncodingWithJunk.jsp", org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail.class, "text/html");
-	}
-
-	public void testFile84() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraJunk.jsp", null, null);
-	}
-
-	public void testFile85() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testExtraValidStuff.jsp", null, null);
-	}
-
-	public void testFile86() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed.jsp", null, null);
-	}
-
-	public void testFile87() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testIllFormed2.jsp", null, null);
-	}
-
-	public void testFile88() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoEncodingValue.jsp", null, null);
-	}
-
-	public void testFile89() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirective.jsp", null, null);
-	}
-
-
-	public void testFile90() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveAtFirst.jsp", null, "text/html");
-	}
-
-	public void testFile91() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", null, null);
-	}
-
-	public void testFile92() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testNormalCase.jsp", null, null);
-	}
-
-	public void testFile93() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/testUTF16.jsp", null, null);
-	}
-
-	public void testFile94() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", null, null);
-	}
-
-	public void testFile95() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", null, null);
-	}
-
-	public void testFile96() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/utf16WithJapaneseChars.jsp", null, null);
-	}
-
-	public void testFile97() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/UTF8With3ByteBOM.jsp", null, null);
-	}
-
-	public void testFile98() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/jsp/WellFormedNormalNonDefault.jsp", null, "text/html");
-	}
-
-	public void testFile99() throws CoreException, IOException {
-		doTest("org.eclipse.jst.jsp.core.jspsource", "testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", null, "text/html");
-	}
-
-
-}
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml b/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
deleted file mode 100644
index 0ece155fd..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-	name="testsuite"
-	default="run"
-	basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-    
-    <property
-		name="plugin-name"
-		value="org.eclipse.jst.jsp.tests.encoding" />
-    <property
-        name="classname"
-        value="org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite" />
-    <property
-        name="testType"
-        value="core-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-	<property
-		name="library-file"
-		value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-	<!-- This target holds all initialization code that needs to be done for -->
-	<!-- all tests that are to be run. Initialization for individual tests -->
-	<!-- should be done within the body of the suite target. -->
-    
-	<target name="init">
-        <tstamp />
-		<delete>
-			<fileset
-				dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-		</delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-	</target>
-
-	<!-- This target defines the tests that need to be run. -->
-	<target name="suite">
-
-		<ant
-			target="${testType}"
-			antfile="${library-file}"
-			dir="${eclipse-home}">
-			<property
-				name="data-dir"
-                value="${workspace}" />
-			<property
-				name="plugin-name"
-                value="${plugin-name}" />
-			<property
-				name="classname"
-				value="${classname}" />
-			<property
-				name="plugin-path"
-				value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-		    
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-	</target>
-
-	<!-- This target holds code to cleanup the testing environment after -->
-	<!-- after all of the tests have been run. You can use this target to -->
-	<!-- delete temporary files that have been created. -->
-	<target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-		<!--<delete dir="${workspace}" quiet="true" />-->
-	</target>
-
-	<!-- This target runs the test suite. Any actions that need to happen -->
-	<!-- after all the tests have been run should go here. -->
-	<target
-		name="run"
-		depends="init,suite,cleanup">
-		<ant
-			target="collect"
-			antfile="${library-file}"
-			dir="${eclipse-home}">
-			<property
-				name="includes"
-                value="${plugin-name}.*xml" />
-			<property
-				name="output-file"
-				value="${plugin-name}.xml" />
-		</ant>
-	</target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/EmptyFile.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
deleted file mode 100644
index 9fd0e75a3..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/IllformedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8?>
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7%>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
deleted file mode 100644
index 265eb15e7..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncoding.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<tag>
-Australi�
-</tag>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
deleted file mode 100644
index 0c3359d5d..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/MalformedNoEncodingXSL.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding=""?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt">
-<xsl:variable name="badEncoding">
-Australi�
-</xsl:variable>
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
deleted file mode 100644
index e5ce76ce8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NoEncodinginXMLDecl.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
deleted file mode 100644
index 5e89e681a..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefault.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="99" encoding="ISO-8859-8"?>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
deleted file mode 100644
index 886248fe7..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@page contentType="text/html; charset=UTF-8" pagetEncoding="ISO-8859-7"%>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
deleted file mode 100644
index 1f27bba82..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/NormalPageCaseNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-
-<%@page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7" %>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
deleted file mode 100644
index f837ee6a8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/SelColBeanRow12ResultsForm.jsp
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-I found this change
-
-<%@ page
-import="SelColBeanRow12ViewBean"
- pageEncoding="SHIFT_JIS"
- contentType="text/html; charset=JUNK"
-%>
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=METAJUNK">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>Results page</TITLE>
-
-<!--Styles-->
-<STYLE TYPE="text/css">
-<!--
-BODY {
-	background-color: #ffffff !important;
-}
-H1 {
-	color: #0000ff !important;
-	text-align: center !important;
-}
-TH {
-	text-align:left !important;
-	color: #000000 !important;
-	vertical-align: top !important;
-}
-TD {
-	text-align:left !important;
-	vertical-align: top !important;
-}
-TH.result {
-	background-color: #999999 !important;
-}
-TD.result {
-	background-color: #cccccc;
-	vertical-align: top !important;
-}
--->
-</STYLE>
-
-
-<!--Style Sheet-->
-<LINK href="/t/theme/Master.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-
-<jsp:useBean id="selColBeanRow12Bean" scope="session" class="SelColBeanRow12ViewBean" type="SelColBeanRow12ViewBean"/>
-<%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-%>
-
-<%
-//Execute Bean Methods
-
-
-%>
-
-<!--Banner-->
-<H1>Results page</H1>
-
-<BR><BR>
-
-<!-- Result Table -->
-<TABLE border="0">
-<TBODY>
-			<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_�\�Z�_</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_�\�Z�_()== null ? "NULL" : selColBeanRow12Bean.getTEST2_�\�Z�_().toString()%>
-			</TD>
-		</TR>
-		<TR>
-			<TH>TEST2_������</TH>
-			<TD>
-
-	<%=selColBeanRow12Bean.getTEST2_������()== null ? "NULL" : selColBeanRow12Bean.getTEST2_������().toString()%>
-			</TD>
-		</TR>
-
-</TBODY>
-</TABLE >
-</body>
-</html>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
deleted file mode 100644
index 39a39cfad..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/UTF8With3ByteBOM.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
deleted file mode 100644
index 9f29652ab..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/WellFormedNormalNonDefault.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-8"?>
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="ISO-8859-7"%>
-<test>
-</test>
-\ No newline at end of file
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
deleted file mode 100644
index 88dbd6f45..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/defect_4205_wps.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ page session="false" buffer="none" %>
-<%@ page language="java" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="/WEB-INF/tld/engine.tld" prefix="wps" %>
-<wps:constants/>
-
-<table>
-<tr><td><img alt="" title="" src='<%= wpsBaseURL %>/images/welcome_5.gif' border="0" align="left" /></td></tr>
-<tr><td>
-<span class="wpsTinyText"><b><%= Version.SERVER_NAME %> <%= Version.SERVER_VERSION %></b><br/>
-建置層次：<%= Version.BUILD_NUMBER %> <%= Version.BUILD_DATE %> <%= Version.BUILD_TIME %><br/>
-<br/>
-Licensed Materials - Property of IBM<br/>
-<%= Version.PRODUCT_NUMBER %><br/>
-(C) Copyright IBM Corp. <%= Copyright.YEARS %> All Rights Reserved.</span></td></tr>
-</table>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
deleted file mode 100644
index 4d092e304..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/inValidEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=abc"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
deleted file mode 100644
index 19c6d16ca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/javaEncodingValue.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"  
-contentType="text/html; charset=Cp1252"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>inValidEncodingValue.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place inValidEncodingValue.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
deleted file mode 100644
index f9a22b49b..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/minimalPageDirective.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ page contentType="text/html" %>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
deleted file mode 100644
index 149d04f15..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/noEncoding.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html"
-%>
-<META http-equiv="Content-Type" content="text/html">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>noEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place noEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
deleted file mode 100644
index 72432ff9c..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCase.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
deleted file mode 100644
index 76569028b..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page 
-language="java"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
deleted file mode 100644
index 94d908f50..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
deleted file mode 100644
index c874a0802..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<jsp:directive.page 
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"/>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
deleted file mode 100644
index b1cb042be..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/nomalDirectiveCasewithXMLDecl.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<%@ page
-pageEncoding= "ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
deleted file mode 100644
index 8267981c0..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testBrokenLine.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"  
-
-encoding="ISO-8859-3" 
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
deleted file mode 100644
index 31f287f49..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncoding.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
deleted file mode 100644
index 8d48684f9..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testDefaultEncodingWithJunk.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="testjunk"?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<%@ page 
-language="java"
-contentType="text/html; charset=ISO-8859-1"
-%>
-<META http-equiv="Content-Type" content="text/html; charset=testjunk">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<META http-equiv="Content-Style-Type" content="text/css">
-<LINK href="../theme/Master.css" rel="stylesheet" type="text/css">
-<TITLE>testDefaultEncoding.jsp</TITLE>
-</HEAD>
-<BODY>
-<P>Place testDefaultEncoding.jsp's content here.</P>
-<%
-System.out.println("test");
-%>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
deleted file mode 100644
index 357f958c4..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraJunk.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0"  abcd="efc"
-
-encoding="ISO-8859-1" 
-
- ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
deleted file mode 100644
index 37d0a3a4a..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testExtraValidStuff.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
deleted file mode 100644
index b6bf901e1..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0 encoding=UTF-8" standalone="yes"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
deleted file mode 100644
index c38ec2b73..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testIllFormed2.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding=UTF-8 
-<test>
-</test>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
deleted file mode 100644
index 83d0c1804..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoEncodingValue.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0"    ?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
deleted file mode 100644
index 1a0174a77..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirective.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<test>
-
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
deleted file mode 100644
index 89a0c3bcc..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveAtFirst.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<test>
- <%@ page 
-pageEncoding="ISO-8859-2"
-language="java"
-contentType="text/html; charset=ISO-8859-3"
-%>
-</test>
-
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
deleted file mode 100644
index 734636fca..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNoPageDirectiveInLargeFile.jsp
+++ /dev/null
@@ -1,356 +0,0 @@
-<test>
-
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-extra junk to make a large file (over 1000 chars)
-</test>
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
deleted file mode 100644
index 5a2c42c89..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testNormalCase.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
deleted file mode 100644
index 75b9850f8..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.FromNotepadjsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
deleted file mode 100644
index 4d9e81783..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/testUTF16.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
deleted file mode 100644
index 47e691612..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
deleted file mode 100644
index d7ffd6d94..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp b/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
deleted file mode 100644
index ddba9bc37..000000000
--- a/tests/org.eclipse.jst.jsp.tests.encoding/testfiles/jsp/utf16WithJapaneseChars.jsp
+++ /dev/null
diff --git a/tests/org.eclipse.wst.css.core.tests/.classpath b/tests/org.eclipse.wst.css.core.tests/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.css.core.tests/.cvsignore b/tests/org.eclipse.wst.css.core.tests/.cvsignore
deleted file mode 100644
index 28e041b54..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-dev.properties
-temp.folder
-csscoretests.jar
diff --git a/tests/org.eclipse.wst.css.core.tests/.project b/tests/org.eclipse.wst.css.core.tests/.project
deleted file mode 100644
index 34797db86..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.css.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.css.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.wst.css.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 1e6341afc..000000000
--- a/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.css.core.tests
-Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: csscoretests.jar
-Bundle-Activator: org.eclipse.wst.css.core.tests.CSSCoreTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.core.tests,
- org.eclipse.wst.css.core.tests.format,
- org.eclipse.wst.css.core.tests.format.testfiles,
- org.eclipse.wst.css.core.tests.model,
- org.eclipse.wst.css.core.tests.source,
- org.eclipse.wst.css.core.tests.testfiles,
- org.eclipse.wst.css.core.tests.testfiles.results,
- org.eclipse.wst.css.core.tests.util
-Require-Bundle: org.eclipse.wst.css.core,
- org.eclipse.wst.sse.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.wst.css.core.tests/about.html b/tests/org.eclipse.wst.css.core.tests/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.wst.css.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.css.core.tests/build.properties b/tests/org.eclipse.wst.css.core.tests/build.properties
deleted file mode 100644
index 2793a9a15..000000000
--- a/tests/org.eclipse.wst.css.core.tests/build.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-bin.includes = test.xml,\
-               csscoretests.jar,\
-               src/,\
-               META-INF/,\
-               about.html
-jars.compile.order = csscoretests.jar
-source.csscoretests.jar = src/
-output.csscoretests.jar = bin/
diff --git a/tests/org.eclipse.wst.css.core.tests/plugin.properties b/tests/org.eclipse.wst.css.core.tests/plugin.properties
deleted file mode 100644
index 4e130a285..000000000
--- a/tests/org.eclipse.wst.css.core.tests/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.css.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = CSS Core Tests Plug-in
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java
deleted file mode 100644
index 821570c9d..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSAllTests.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.core.tests.format.TestCleanupProcessorCSS;
-import org.eclipse.wst.css.core.tests.format.TestFormatProcessorCSS;
-import org.eclipse.wst.css.core.tests.model.CSSCharsetRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSFontFaceRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSImportRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSMediaRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSPageRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSStyleRuleTest;
-import org.eclipse.wst.css.core.tests.model.CSSStyleSheetTest;
-import org.eclipse.wst.css.core.tests.source.CSSSelectorTest;
-import org.eclipse.wst.css.core.tests.source.CSSSourceParserTest;
-import org.eclipse.wst.css.core.tests.source.CSSTextParserTest;
-import org.eclipse.wst.css.core.tests.source.CSSUrlTest;
-
-
-public class CSSAllTests extends TestSuite {
-	public static Test suite() {
-		TestSuite suite = new TestSuite("SSE Model CSS Tests");
-
-		addSourceTests(suite);
-		addModelTests(suite);
-
-		suite.addTestSuite(CSSCorePreferencesTest.class);
-		return suite;
-	}
-
-	private static void addSourceTests(TestSuite suite) {
-		suite.addTestSuite(CSSSourceParserTest.class);
-		suite.addTestSuite(CSSTextParserTest.class);
-		suite.addTestSuite(CSSSelectorTest.class);
-		suite.addTestSuite(CSSUrlTest.class);
-	}
-
-	private static void addModelTests(TestSuite suite) {
-		suite.addTestSuite(CSSStyleSheetTest.class);
-		suite.addTestSuite(CSSCharsetRuleTest.class);
-		suite.addTestSuite(CSSImportRuleTest.class);
-		suite.addTestSuite(CSSStyleRuleTest.class);
-		suite.addTestSuite(CSSMediaRuleTest.class);
-		suite.addTestSuite(CSSPageRuleTest.class);
-		suite.addTestSuite(CSSFontFaceRuleTest.class);
-		suite.addTestSuite(TestFormatProcessorCSS.class);
-		suite.addTestSuite(TestCleanupProcessorCSS.class);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java
deleted file mode 100644
index e530d3bc2..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCorePreferencesTest.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the XML Source editor
- * preferences. Tests include setting/getting preferences.
- * 
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class CSSCorePreferencesTest extends TestCase {
-	/**
-	 * Tests existance of preference values when getting preference values
-	 * through Platform.getPreferencesService()
-	 */
-	public void testBundleGetPreferences() {
-		final String bundleName = "org.eclipse.wst.xml.core";
-
-		// need to start up bundle for default values to be loaded
-		Bundle bundle = Platform.getBundle(bundleName);
-		try {
-			if (bundle != null)
-				bundle.start();
-			else
-				fail("Get preference value failed because could not find bundle: " + bundleName);
-		}
-		catch (BundleException e) {
-			fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
-		}
-
-		bundleGetPreference(bundleName, CSSCorePreferenceNames.INDENTATION_SIZE);
-		bundleGetPreference(bundleName, CSSCorePreferenceNames.LINE_WIDTH);
-	}
-
-	private void bundleGetPreference(String bundleName, String prefKey) {
-		int defaultValue = -1;
-
-		int value = Platform.getPreferencesService().getInt(bundleName, prefKey, defaultValue, null);
-		assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
-	}
-
-	/**
-	 * Tests default values of preferences.
-	 * 
-	 * NOTE: Expected default values are hard-coded, so if default values do
-	 * get changed, assertions need to be updated as well
-	 */
-	public void testPluginGetDefaultPreferences() {
-		IEclipsePreferences node = new DefaultScope().getNode(CSSCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		pluginGetDefaultPreference(node, CSSCorePreferenceNames.CASE_IDENTIFIER, "2");
-		pluginGetDefaultPreference(node, CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
-	}
-
-	private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
-		String defaultValue = Long.toString(System.currentTimeMillis()); // random
-		// string
-
-		String theDefaultValue = node.get(prefKey, defaultValue);
-		assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
-	}
-
-	/**
-	 * Tests setting preference values by setting preference value to be a
-	 * certain value, then getting the preference value to verify it was set.
-	 */
-	public void testPluginSetPreferences() {
-		IEclipsePreferences node = new InstanceScope().getNode(CSSCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		pluginSetPreferenceBoolean(node, CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE);
-		pluginSetPreferenceInt(node, CSSCorePreferenceNames.CASE_PROPERTY_NAME);
-	}
-
-	private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
-		boolean originalValue = false;
-		boolean expectedValue = true;
-
-		String originalString = node.get(prefKey, "bogus");
-		if (!"bogus".equals(originalString)) {
-			originalValue = Boolean.valueOf(originalString).booleanValue();
-			expectedValue = !originalValue;
-		}
-		node.putBoolean(prefKey, expectedValue);
-		boolean foundValue = node.getBoolean(prefKey, true);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		if ("bogus".equals(originalString))
-			node.remove(prefKey);
-		else
-			node.put(prefKey, originalString);
-	}
-
-	private void pluginSetPreferenceInt(IEclipsePreferences node, String prefKey) {
-		int originalValue = node.getInt(prefKey, -999);
-		int expectedValue = -888;
-		node.putInt(prefKey, expectedValue);
-		int foundValue = node.getInt(prefKey, -999);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		if (originalValue == -999)
-			node.remove(prefKey);
-		else
-			node.putInt(prefKey, originalValue);
-	}
-
-	/**
-	 * Tests line delimiter preferences by making sure document created
-	 * follows line delimiter preference.
-	 */
-	public void testDelimiterPreferences() {
-		// check if content type preferences match
-		String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForCSS.ContentTypeID_CSS);
-		Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForCSS.ContentTypeID_CSS);
-		String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
-		assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
-		// set a particular line delimiter
-		prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
-		// create document
-		CSSDocumentLoader loader = new CSSDocumentLoader();
-		IEncodedDocument document = loader.createNewStructuredDocument();
-		String documentDelimiter = document.getPreferredLineDelimiter();
-
-		// verify delimiter in document matches preference
-		assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
-		// return to original preference
-		prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
-	}
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java
deleted file mode 100644
index edb47a272..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestSuite.java
+++ /dev/null
@@ -1,31 +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.css.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-/**
- * @author pavery
- */
-public class CSSCoreTestSuite extends TestSuite {
-
-	public static Test suite() {
-		return new CSSCoreTestSuite();
-	}
-
-	public CSSCoreTestSuite() {
-		super("CSS Core Tests");
-
-		addTest(CSSAllTests.suite());
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java
deleted file mode 100644
index 19dc51656..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/CSSCoreTestsPlugin.java
+++ /dev/null
@@ -1,68 +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.css.core.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSCoreTestsPlugin extends Plugin {
-	// The shared instance.
-	private static CSSCoreTestsPlugin plugin;
-	// Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public CSSCoreTestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.css.core.tests.CSSModelTestsPluginResources");
-		}
-		catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static CSSCoreTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = CSSCoreTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java
deleted file mode 100644
index a6c75b7f4..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestCleanupProcessorCSS.java
+++ /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
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategyImpl;
-import org.eclipse.wst.css.core.internal.cleanup.CleanupProcessorCSS;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.tests.util.StringCompareUtil;
-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;
-
-public class TestCleanupProcessorCSS extends TestCase {
-	private static final String UTF_8 = "UTF-8";
-	private StringCompareUtil fStringCompareUtil;
-	private CleanupProcessorCSS fCleanupProcessor;
-
-	private boolean fOldClearBlankLinesPref;
-	private int fOldMaxLineWidthPref;
-	private String fOldIndentationCharPref;
-	private int fOldIndentationSizePref;
-
-	protected void setUp() throws Exception {
-		// set up preferences
-		Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
-		fOldClearBlankLinesPref = prefs.getBoolean(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
-		fOldMaxLineWidthPref = prefs.getInt(CSSCorePreferenceNames.LINE_WIDTH);
-		fOldIndentationCharPref = prefs.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
-		fOldIndentationSizePref = prefs.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
-		prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, false);
-		prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, 72);
-		prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
-		prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, 1);
-
-		fCleanupProcessor = new CleanupProcessorCSS();
-		fStringCompareUtil = new StringCompareUtil();
-	}
-
-	protected void tearDown() throws Exception {
-		// restore old preferences
-		Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
-		prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, fOldClearBlankLinesPref);
-		prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, fOldMaxLineWidthPref);
-		prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, fOldIndentationCharPref);
-		prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, fOldIndentationSizePref);
-	}
-
-	/**
-	 * must release model (from edit) after
-	 * 
-	 * @param filename
-	 *            relative to this class (TestCleanupProcessorCSS)
-	 */
-	private IStructuredModel getModelForEdit(final String filename) {
-
-		IStructuredModel model = null;
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			InputStream inStream = getClass().getResourceAsStream(filename);
-			if (inStream == null)
-				throw new FileNotFoundException("Can't file resource stream " + filename);
-			final String baseFile = getClass().getResource(filename).toString();
-			model = modelManager.getModelForEdit(baseFile, inStream, null);
-		}
-		catch (IOException ex) {
-			ex.printStackTrace();
-		}
-		return model;
-	}
-
-	private void cleanupAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
-		IStructuredModel beforeModel = null, afterModel = null;
-		try {
-			beforeModel = getModelForEdit(beforePath);
-			assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
-			afterModel = getModelForEdit(afterPath);
-			assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
-			fCleanupProcessor.cleanupModel(beforeModel);
-
-			ByteArrayOutputStream cleanedupBytes = new ByteArrayOutputStream();
-			beforeModel.save(cleanedupBytes); // "beforeModel" should now be
-			// after the cleanup processor
-
-			ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
-			afterModel.save(afterBytes);
-
-			String cleanedupContents = new String(afterBytes.toByteArray(), UTF_8);
-			String expectedContents = new String(cleanedupBytes.toByteArray(), UTF_8);
-			assertTrue("Cleanup document differs from the expected", fStringCompareUtil.equalsIgnoreLineSeperator(cleanedupContents, expectedContents));
-		}
-		finally {
-			if (beforeModel != null)
-				beforeModel.releaseFromEdit();
-			if (afterModel != null)
-				afterModel.releaseFromEdit();
-		}
-	}
-
-	public void testBUG166909urlCaseCleanup() throws UnsupportedEncodingException, IOException, CoreException {
-		// set up cleanup preferences for this test
-		CSSCleanupStrategy currentStrategy = CSSCleanupStrategyImpl.getInstance();
-		short oldCaseIdentifier = currentStrategy.getIdentCase();
-		short oldCasePropertyName = currentStrategy.getPropNameCase();
-		short oldCasePropertyValue = currentStrategy.getPropValueCase();
-		short oldCaseSelector = currentStrategy.getSelectorTagCase();
-		boolean oldFormatSource = currentStrategy.isFormatSource();
-		boolean oldFormatQuote = currentStrategy.isQuoteValues();
-
-		currentStrategy.setIdentCase(CSSCleanupStrategy.LOWER);
-		currentStrategy.setPropNameCase(CSSCleanupStrategy.LOWER);
-		currentStrategy.setPropValueCase(CSSCleanupStrategy.LOWER);
-		currentStrategy.setSelectorTagCase(CSSCleanupStrategy.LOWER);
-		currentStrategy.setFormatSource(true);
-		currentStrategy.setQuoteValues(false);
-
-		cleanupAndAssertEquals("testfiles/bug166909-urlcase.css", "testfiles/bug166909-urlcase-cleaned.css");
-
-		currentStrategy.setIdentCase(oldCaseIdentifier);
-		currentStrategy.setPropNameCase(oldCasePropertyName);
-		currentStrategy.setPropValueCase(oldCasePropertyValue);
-		currentStrategy.setSelectorTagCase(oldCaseSelector);
-		currentStrategy.setFormatSource(oldFormatSource);
-		currentStrategy.setQuoteValues(oldFormatQuote);
-	}
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java
deleted file mode 100644
index 112fdf675..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/TestFormatProcessorCSS.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.format;
-
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.format.FormatProcessorCSS;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.tests.util.StringCompareUtil;
-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;
-
-public class TestFormatProcessorCSS extends TestCase {
-	private static final String UTF_8 = "UTF-8";
-	private StringCompareUtil fStringCompareUtil;
-	private FormatProcessorCSS formatProcessor;
-
-	private boolean fOldClearBlankLinesPref;
-	private int fOldMaxLineWidthPref;
-	private String fOldIndentationCharPref;
-	private int fOldIndentationSizePref;
-
-	public TestFormatProcessorCSS(String name) {
-		super(name);
-	}
-
-	protected void setUp() throws Exception {
-		// set up preferences
-		Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
-		fOldClearBlankLinesPref = prefs.getBoolean(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
-		fOldMaxLineWidthPref = prefs.getInt(CSSCorePreferenceNames.LINE_WIDTH);
-		fOldIndentationCharPref = prefs.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
-		fOldIndentationSizePref = prefs.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
-		prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, false);
-		prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, 72);
-		prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
-		prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, 1);
-
-		formatProcessor = new FormatProcessorCSS();
-		fStringCompareUtil = new StringCompareUtil();
-	}
-
-	protected void tearDown() throws Exception {
-		// restore old preferences
-		Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
-		prefs.setValue(CSSCorePreferenceNames.CLEAR_ALL_BLANK_LINES, fOldClearBlankLinesPref);
-		prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, fOldMaxLineWidthPref);
-		prefs.setValue(CSSCorePreferenceNames.INDENTATION_CHAR, fOldIndentationCharPref);
-		prefs.setValue(CSSCorePreferenceNames.INDENTATION_SIZE, fOldIndentationSizePref);
-	}
-
-	/**
-	 * must release model (from edit) after
-	 * 
-	 * @param filename
-	 *            relative to this class (TestFormatProcessorCSS)
-	 */
-	private IStructuredModel getModelForEdit(final String filename) {
-
-		IStructuredModel model = null;
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			InputStream inStream = getClass().getResourceAsStream(filename);
-			if (inStream == null)
-				throw new FileNotFoundException("Can't file resource stream " + filename);
-			final String baseFile = getClass().getResource(filename).toString();
-			model = modelManager.getModelForEdit(baseFile, inStream, null);
-		}
-		catch (IOException ex) {
-			ex.printStackTrace();
-		}
-		return model;
-	}
-
-	private void formatAndAssertEquals(String beforePath, String afterPath) throws UnsupportedEncodingException, IOException, CoreException {
-		IStructuredModel beforeModel = null, afterModel = null;
-		try {
-			beforeModel = getModelForEdit(beforePath);
-			assertNotNull("could not retrieve structured model for : " + beforePath, beforeModel);
-
-			afterModel = getModelForEdit(afterPath);
-			assertNotNull("could not retrieve structured model for : " + afterPath, afterModel);
-
-			formatProcessor.formatModel(beforeModel);
-
-			ByteArrayOutputStream formattedBytes = new ByteArrayOutputStream();
-			beforeModel.save(formattedBytes); // "beforeModel" should now be
-			// after the formatter
-
-			ByteArrayOutputStream afterBytes = new ByteArrayOutputStream();
-			afterModel.save(afterBytes);
-
-			String formattedContents = new String(afterBytes.toByteArray(), UTF_8);
-			String expectedContents = new String(formattedBytes.toByteArray(), UTF_8);
-			assertTrue("Formatted document differs from the expected", fStringCompareUtil.equalsIgnoreLineSeperator(formattedContents, expectedContents));
-		}
-		finally {
-			if (beforeModel != null)
-				beforeModel.releaseFromEdit();
-			if (afterModel != null)
-				afterModel.releaseFromEdit();
-		}
-	}
-
-	public void testBUG73990SelectorFormat() throws UnsupportedEncodingException, IOException, CoreException {
-		formatAndAssertEquals("testfiles/BUG73990_selector_unformatted.css", "testfiles/BUG73990_selector_formatted.css");
-	}
-
-	/**
-	 * Tests case when format would incorrectly add extra semicolons.
-	 * 
-	 * @throws UnsupportedEncodingException
-	 * @throws IOException
-	 * @throws CoreException
-	 */
-	public void testBUG111569extraSemicolonFormat() throws UnsupportedEncodingException, IOException, CoreException {
-		formatAndAssertEquals("testfiles/bug111569-extrasemicolon.css", "testfiles/bug111569-extrasemicolon-formatted.css");
-	}
-
-	/**
-	 * Tests case when format would incorrectly add space between selector and
-	 * attribute selectors <code>input[type="hidden"]</code> would be
-	 * wrongly formatted as<code>input [type="hidden"]</code> instead of
-	 * being left alone.
-	 * 
-	 * @throws UnsupportedEncodingException
-	 * @throws IOException
-	 * @throws CoreException
-	 */
-	public void testBUG146198attributeSpecifierFormat() throws UnsupportedEncodingException, IOException, CoreException {
-		formatAndAssertEquals("testfiles/bug146198-attributespecifier.css", "testfiles/bug146198-attributespecifier-formatted.css");
-	}
-	
-	public void testBUG110539multipleClassFormat() throws UnsupportedEncodingException, IOException, CoreException {
-		formatAndAssertEquals("testfiles/bug110539-multipleclass.css", "testfiles/bug110539-multipleclass-formatted.css");
-	}
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css
deleted file mode 100644
index 6da6ff707..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_formatted.css
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Class as selector */
-H1.pastoral {
-	color: #00FF00
-}
-
-/* ID as selector */
-#z98y {
-	letter-spacing: 0.3em
-}
-
-H1#z98y {
-	letter-spacing: 0.5em
-}
-
-/* Contextual selectors */
-DIV P {
-	font: small sans-serif
-}
-
-.reddish H1 {
-	color: red
-}
-
-#x78y CODE {
-	background: blue
-}
-
-DIV.sidenote H1 {
-	font-size: large
-}
-
-/* Anchor pseudo-classes */
-A:link {
-	color: red
-}  /* unvisited link */
-A:visited {
-	color: blue
-}  /* visited links */
-A:active {
-	color: lime
-}  /* active links */ /* Pseudo-class combined with normal class */
-A.external:visited {
-	color: blue
-}
-
-/* 'first-line' pseudo-element */
-P:first-line {
-	font-variant: small-caps
-}
-
-/* 'first-letter' pseudo-element */
-P:first-letter {
-	font-size: 200%;
-	float: left
-}
-
-/* Pseudo-elements in selectors */
-BODY P:first-letter {
-	color: purple
-}
-
-P.initial:first-letter {
-	color: red
-}
-
-/* Multiple pseudo-elements */
-P {
-	color: red;
-	font-size: 12pt
-}
-
-P:first-letter {
-	color: green;
-	font-size: 200%
-}
-
-P:first-line {
-	color: blue
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css
deleted file mode 100644
index ed52c9395..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/BUG73990_selector_unformatted.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Class as selector */
-H1.pastoral { color: #00FF00 }
-
-/* ID as selector */
-#z98y { letter-spacing: 0.3em }
-H1#z98y { letter-spacing: 0.5em }
-
-/* Contextual selectors */
-DIV P           { font: small sans-serif }
-.reddish H1     { color: red }
-#x78y CODE      { background: blue }
-DIV.sidenote H1 { font-size: large }
-
-/* Anchor pseudo-classes */
-A:link { color: red }       /* unvisited link */
-A:visited { color: blue }   /* visited links */
-A:active { color: lime }    /* active links */
-
-/* Pseudo-class combined with normal class */ 
-A.external:visited { color: blue }
-
-/* 'first-line' pseudo-element */
-P:first-line { font-variant: small-caps }
-
-/* 'first-letter' pseudo-element */
-P:first-letter { font-size: 200%; float: left }
-
-/* Pseudo-elements in selectors */
-BODY P:first-letter { color: purple }
-P.initial:first-letter { color: red }
-
-/* Multiple pseudo-elements */
-P { color: red; font-size: 12pt }
-P:first-letter { color: green; font-size: 200% }
-P:first-line { color: blue }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css
deleted file mode 100644
index 537e7b502..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass-formatted.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 2 separate classes - yes space */
-.classOne .classTwo {
-	color: red;
-}
-
-/* multiple classes - no space */
-.classOne.classTwo {
-	color: lime;
-}
-
-/* id and class - yes space */
-#myid .myclass {
-	border-top: 0px;
-}
-
-/* id with class - no space */
-#myid.myclass {
-	border-top: 0px;
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css
deleted file mode 100644
index fe5073f93..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug110539-multipleclass.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/* 2 separate classes - yes space */
-.classOne .classTwo {
-color: red;
-}
-
-/* multiple classes - no space */
-.classOne.classTwo {
-color: lime;
-}
-
-/* id and class - yes space */
-#myid .myclass {
-border-top: 0px;
-}
-
-/* id with class - no space */
-#myid.myclass {
-border-top: 0px;
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css
deleted file mode 100644
index c66e6e9d5..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon-formatted.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.sitemaplev1 {
-	font-family: Verdana;
-	font-size: 12px;
-	line-height: 17px;
-	color: #666666;
-	font-weight: bold;
-	text-decoration: none;
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css
deleted file mode 100644
index c8e307d6e..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug111569-extrasemicolon.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.sitemaplev1{font-family:Verdana;font-size:12px;line-height:17px;
-color:#666666;font-weight:bold;
-text-decoration:none;}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css
deleted file mode 100644
index 55ad1ca26..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier-formatted.css
+++ /dev/null
@@ -1,3 +0,0 @@
-input[type="hidden"] {
-	width: 98%;
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css
deleted file mode 100644
index 72c1dbdaa..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug146198-attributespecifier.css
+++ /dev/null
@@ -1,3 +0,0 @@
-input[type="hidden"] {
-width: 98%;
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css
deleted file mode 100644
index 60dea46dd..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase-cleaned.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#demo {
-	background: url(mixedCase/projectLogo.gif);
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css
deleted file mode 100644
index dfd0aaa58..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/format/testfiles/bug166909-urlcase.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#demo {
-	background: URL(mixedCase/projectLogo.gif);
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java
deleted file mode 100644
index 87d88c08a..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/AbstractModelTest.java
+++ /dev/null
@@ -1,173 +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.css.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.Counter;
-import org.w3c.dom.css.RGBColor;
-import org.w3c.dom.css.Rect;
-
-public class AbstractModelTest extends TestCase {
-	protected ICSSModel fModel = null;
-
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		Preferences prefs = CSSCorePlugin.getDefault().getPluginPreferences();
-		prefs.setValue(CSSCorePreferenceNames.CASE_IDENTIFIER, CSSCorePreferenceNames.LOWER);
-		prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_NAME, CSSCorePreferenceNames.LOWER);
-		prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_VALUE, CSSCorePreferenceNames.LOWER);
-
-		fModel = FileUtil.createModel();
-	}
-
-	protected void tearDown() throws Exception {
-		if (fModel != null) {
-			fModel.releaseFromEdit();
-			fModel = null;
-		}
-		super.tearDown();
-	}
-
-	protected ICSSModel getModel() {
-		return fModel;
-	}
-
-	protected ICSSStyleSheet getStyleSheet() {
-		return (ICSSStyleSheet) fModel.getDocument();
-	}
-
-	class PrimitiveNumber {
-		short type;
-		float value;
-
-		PrimitiveNumber(short newType, float newValue) {
-			type = newType;
-			value = newValue;
-		}
-	}
-
-	class PrimitiveString {
-		short type;
-		String value;
-
-		PrimitiveString(short newType, String newValue) {
-			type = newType;
-			value = newValue;
-		}
-	}
-
-	/* for int, float */
-	protected void checkPrimitiveNumber(CSSValue actual, PrimitiveNumber expected) {
-		assertTrue(actual instanceof CSSPrimitiveValue);
-		assertEquals(expected.type, ((CSSPrimitiveValue) actual).getPrimitiveType());
-		assertEquals(expected.value, ((CSSPrimitiveValue) actual).getFloatValue(expected.type), 0);
-	}
-
-	/* for string */
-	protected void checkPrimitiveString(CSSValue actual, PrimitiveString expected) {
-		assertTrue(actual instanceof CSSPrimitiveValue);
-		assertEquals(expected.type, ((CSSPrimitiveValue) actual).getPrimitiveType());
-		assertEquals(expected.value, ((CSSPrimitiveValue) actual).getStringValue());
-	}
-
-	/* for counter */
-	protected void checkPrimitiveCounter(CSSValue actual, String identifier, String listStyle, String separator) {
-		assertTrue(actual instanceof CSSPrimitiveValue);
-		assertEquals(CSSPrimitiveValue.CSS_COUNTER, ((CSSPrimitiveValue) actual).getPrimitiveType());
-		Counter counter = ((CSSPrimitiveValue) actual).getCounterValue();
-		assertEquals(identifier, counter.getIdentifier());
-		assertEquals(listStyle, counter.getListStyle());
-		assertEquals(separator, counter.getSeparator());
-	}
-
-	/* for rect */
-	protected void checkPrimitiveRect(CSSValue actual, Object[] expectedArray) {
-		assertTrue(actual instanceof CSSPrimitiveValue);
-		assertEquals(CSSPrimitiveValue.CSS_RECT, ((CSSPrimitiveValue) actual).getPrimitiveType());
-		Rect rect = ((CSSPrimitiveValue) actual).getRectValue();
-		CSSPrimitiveValue value;
-		Object expected;
-		value = rect.getTop();
-		expected = expectedArray[0];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-		value = rect.getRight();
-		expected = expectedArray[1];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-		value = rect.getBottom();
-		expected = expectedArray[2];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-		value = rect.getLeft();
-		expected = expectedArray[3];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-	}
-
-	/* for rgb */
-	protected void checkPrimitiveRgb(CSSValue actual, Object[] expectedArray) {
-		assertTrue(actual instanceof CSSPrimitiveValue);
-		assertEquals(CSSPrimitiveValue.CSS_RGBCOLOR, ((CSSPrimitiveValue) actual).getPrimitiveType());
-		RGBColor color = ((CSSPrimitiveValue) actual).getRGBColorValue();
-		CSSPrimitiveValue value;
-		Object expected;
-		value = color.getRed();
-		expected = expectedArray[0];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-		value = color.getGreen();
-		expected = expectedArray[1];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-		value = color.getBlue();
-		expected = expectedArray[2];
-		if (expected instanceof PrimitiveNumber) {
-			checkPrimitiveNumber(value, (PrimitiveNumber) expected);
-		}
-		else {
-			checkPrimitiveString(value, (PrimitiveString) expected);
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java
deleted file mode 100644
index d00a9b0c2..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSCharsetRuleTest.java
+++ /dev/null
@@ -1,48 +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.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.w3c.dom.css.CSSCharsetRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-
-public class CSSCharsetRuleTest extends AbstractModelTest {
-	private final String RULE = "@charset \"iso-8859-1\";";
-
-	public void testInsertRule() {
-		CSSStyleSheet sheet = getStyleSheet();
-
-		assertEquals(0, sheet.insertRule(RULE, 0));
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSCharsetRule);
-		CSSCharsetRule charsetRule = (CSSCharsetRule) rule;
-		assertEquals("iso-8859-1", charsetRule.getEncoding());
-		assertEquals(RULE, charsetRule.getCssText());
-	}
-
-	public void testCreateRule() {
-		ICSSStyleSheet sheet = getStyleSheet();
-		ICSSDocument doc = sheet;
-		CSSCharsetRule newRule = doc.createCSSCharsetRule();
-		newRule.setEncoding("iso-8859-1");
-		sheet.insertRuleBefore(newRule, null);
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSCharsetRule);
-		CSSCharsetRule charsetRule = (CSSCharsetRule) rule;
-		assertEquals("iso-8859-1", charsetRule.getEncoding());
-		assertEquals(RULE, charsetRule.getCssText());
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java
deleted file mode 100644
index dcb5fdf88..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSFontFaceRuleTest.java
+++ /dev/null
@@ -1,265 +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.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSFontFaceRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.CSSValueList;
-
-public class CSSFontFaceRuleTest extends AbstractModelTest {
-	public void testInsertRule() {
-		final String RULE = "@font-face { font-family: \"Swiss 721\"; src: url(swiss721.pfr); /* The expanded Swiss 721 */ font-stretch: expanded; }";
-		CSSStyleSheet sheet = getStyleSheet();
-		assertEquals(0, sheet.insertRule(RULE, 0));
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSFontFaceRule);
-
-		CSSStyleDeclaration declaration = ((CSSFontFaceRule) rule).getStyle();
-		assertEquals(3, declaration.getLength());
-
-		CSSValue value;
-		CSSPrimitiveValue primitiveValue;
-
-		value = declaration.getPropertyCSSValue("font-family");
-		assertTrue(value instanceof CSSPrimitiveValue);
-
-		primitiveValue = (CSSPrimitiveValue) value;
-		assertEquals(CSSPrimitiveValue.CSS_STRING, primitiveValue.getPrimitiveType());
-		assertEquals("Swiss 721", primitiveValue.getStringValue());
-
-		value = declaration.getPropertyCSSValue("src");
-		assertTrue(value instanceof CSSPrimitiveValue);
-
-		primitiveValue = (CSSPrimitiveValue) value;
-		assertEquals(CSSPrimitiveValue.CSS_URI, primitiveValue.getPrimitiveType());
-		assertEquals("swiss721.pfr", primitiveValue.getStringValue());
-
-		value = declaration.getPropertyCSSValue("font-stretch");
-		assertTrue(value instanceof CSSPrimitiveValue);
-
-		primitiveValue = (CSSPrimitiveValue) value;
-		assertEquals(CSSPrimitiveValue.CSS_IDENT, primitiveValue.getPrimitiveType());
-		assertEquals("expanded", primitiveValue.getStringValue());
-	}
-
-	public void testInsertText1() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-		CSSValueList valueList;
-
-		// rule 1
-
-		rule = ruleList.item(0);
-		assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSFontFaceRule);
-
-		declaration = ((CSSFontFaceRule) rule).getStyle();
-		assertEquals(4, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("font-family");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "Swiss 721"));
-
-		value = declaration.getPropertyCSSValue("src");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_URI, "swiss721blk.pfr"));
-
-		value = declaration.getPropertyCSSValue("font-style");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(3, valueList.getLength());
-
-		checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "italic"));
-
-		value = declaration.getPropertyCSSValue("font-weight");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(3, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 800));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 900));
-	}
-
-	public void testInsertText2() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-		CSSValueList valueList;
-
-		// rule 2
-
-		rule = ruleList.item(1);
-		assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSFontFaceRule);
-
-		declaration = ((CSSFontFaceRule) rule).getStyle();
-		assertEquals(6, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("src");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(9, valueList.getLength());
-
-		checkPrimitiveString(valueList.item(0), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Palatino"));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(2), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Times New Roman"));
-		checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(4), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "New York"));
-		checkPrimitiveString(valueList.item(5), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(6), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Utopia"));
-		checkPrimitiveString(valueList.item(7), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(8), new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://somewhere/free/font"));
-
-		value = declaration.getPropertyCSSValue("font-family");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "serif"));
-
-		value = declaration.getPropertyCSSValue("font-weight");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(9, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 100));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 200));
-		checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 300));
-		checkPrimitiveString(valueList.item(5), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(6), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 400));
-		checkPrimitiveString(valueList.item(7), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(8), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 500));
-
-		value = declaration.getPropertyCSSValue("font-style");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-
-		value = declaration.getPropertyCSSValue("font-variant");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "normal"));
-
-		value = declaration.getPropertyCSSValue("font-size");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "all"));
-	}
-
-	public void testInsertText3() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSFontFaceRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-		CSSValueList valueList;
-
-		// rule 3
-
-		rule = ruleList.item(2);
-		assertEquals(CSSRule.FONT_FACE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSFontFaceRule);
-
-		declaration = ((CSSFontFaceRule) rule).getStyle();
-		assertEquals(5, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("src");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(4, valueList.getLength());
-
-		checkPrimitiveString(valueList.item(0), new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Alabama Italic"));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://www.fonts.org/A/alabama-italic"));
-		checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_FORMAT, "truetype"));
-
-		value = declaration.getPropertyCSSValue("panose-1");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(10, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 2));
-		checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 4));
-		checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
-		checkPrimitiveNumber(valueList.item(3), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 2));
-		checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
-		checkPrimitiveNumber(valueList.item(5), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 4));
-		checkPrimitiveNumber(valueList.item(6), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 5));
-		checkPrimitiveNumber(valueList.item(7), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 9));
-		checkPrimitiveNumber(valueList.item(8), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 3));
-		checkPrimitiveNumber(valueList.item(9), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 3));
-
-		value = declaration.getPropertyCSSValue("font-family");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(3, valueList.getLength());
-
-		checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "Alabama"));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "serif"));
-
-		value = declaration.getPropertyCSSValue("font-weight");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(5, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 300));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(2), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 400));
-		checkPrimitiveString(valueList.item(3), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveNumber(valueList.item(4), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 500));
-
-		value = declaration.getPropertyCSSValue("font-style");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(3, valueList.getLength());
-
-		checkPrimitiveString(valueList.item(0), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "italic"));
-		checkPrimitiveString(valueList.item(1), new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-		checkPrimitiveString(valueList.item(2), new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "oblique"));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java
deleted file mode 100644
index fc579b581..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSImportRuleTest.java
+++ /dev/null
@@ -1,94 +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.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.w3c.dom.css.CSSImportRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.stylesheets.MediaList;
-
-public class CSSImportRuleTest extends AbstractModelTest {
-
-	public void testInsertRuleDoubleQuote() {
-		checkInsert("@import \"dummy.css\";", "dummy.css", null);
-	}
-
-	public void testInsertRuleSingleQuote() {
-		checkInsert("@import \'dummy.css\';", "dummy.css", null);
-	}
-
-	public void testInsertRuleUrlNoQuote() {
-		checkInsert("@import url(dummy.css);", "dummy.css", null);
-	}
-
-	public void testInsertRuleUrlDoubleQuote() {
-		checkInsert("@import url(\"dummy.css\");", "dummy.css", null);
-	}
-
-	public void testInsertRuleUrlSingleQuote() {
-		checkInsert("@import url(\'dummy.css\');", "dummy.css", null);
-	}
-
-	public void testInsertRuleMedia1() {
-		checkInsert("@import url(\"dummy.css\") media1;", "dummy.css", new String[]{"media1"});
-	}
-
-	public void testInsertRuleMedia2() {
-		checkInsert("@import url(\'dummy.css\') media1, media2;", "dummy.css", new String[]{"media1", "media2"});
-	}
-
-	public void testCreateRule() {
-		ICSSStyleSheet sheet = getStyleSheet();
-		ICSSDocument doc = sheet;
-		ICSSImportRule newRule = doc.createCSSImportRule();
-		newRule.setHref("dummy.css");
-		MediaList newList = newRule.getMedia();
-		newList.appendMedium("media1");
-		newList.appendMedium("media2");
-		sheet.insertRuleBefore(newRule, null);
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSImportRule);
-		CSSImportRule importRule = (CSSImportRule) rule;
-		assertEquals("dummy.css", importRule.getHref());
-		MediaList mediaList = importRule.getMedia();
-		assertEquals(2, mediaList.getLength());
-		assertEquals("media1", mediaList.item(0));
-		assertEquals("media2", mediaList.item(1));
-
-		assertEquals("@import url(\"dummy.css\") media1, media2;", importRule.getCssText());
-	}
-
-	private void checkInsert(String ruleString, String href, String[] media) {
-		CSSStyleSheet sheet = getStyleSheet();
-
-		assertEquals(0, sheet.insertRule(ruleString, 0));
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSImportRule);
-
-		CSSImportRule importRule = (CSSImportRule) rule;
-		assertEquals(href, importRule.getHref());
-
-		if (media != null) {
-			assertEquals(media.length, importRule.getMedia().getLength());
-			for (int i = 0; i < media.length; i++) {
-				assertEquals(media[i], importRule.getMedia().item(i));
-			}
-		}
-
-		assertEquals(ruleString, importRule.getCssText());
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java
deleted file mode 100644
index 306d9a1d6..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSMediaRuleTest.java
+++ /dev/null
@@ -1,42 +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.css.core.tests.model;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.w3c.dom.css.CSSMediaRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.stylesheets.MediaList;
-
-public class CSSMediaRuleTest extends AbstractModelTest {
-	public void testCreateRule() {
-		ICSSStyleSheet sheet = getStyleSheet();
-		ICSSDocument doc = sheet;
-		ICSSMediaRule newRule = doc.createCSSMediaRule();
-		MediaList newList = newRule.getMedia();
-		newList.appendMedium("media1");
-		newList.appendMedium("media2");
-		sheet.insertRuleBefore(newRule, null);
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule = ruleList.item(0);
-		assertTrue(rule instanceof CSSMediaRule);
-		CSSMediaRule mediaRule = (CSSMediaRule) rule;
-
-		MediaList mediaList = mediaRule.getMedia();
-		assertEquals(2, mediaList.getLength());
-		assertEquals("media1", mediaList.item(0));
-		assertEquals("media2", mediaList.item(1));
-
-		assertEquals("@media media1, media2 {" + FileUtil.commonEOL + "}", mediaRule.getCssText());
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java
deleted file mode 100644
index 78ec435f3..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSPageRuleTest.java
+++ /dev/null
@@ -1,215 +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.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPageRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-import org.w3c.dom.css.CSSValueList;
-
-public class CSSPageRuleTest extends AbstractModelTest {
-	public void testInsertText1() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-		CSSValueList valueList;
-
-		// rule 1
-
-		rule = ruleList.item(0);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(2, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("size");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(2, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, (float) 8.5));
-		checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, 11));
-
-		value = declaration.getPropertyCSSValue("margin");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 2));
-	}
-
-	public void testInsertText2() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		// rule 2
-
-		rule = ruleList.item(1);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(2, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("size");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "auto"));
-
-		value = declaration.getPropertyCSSValue("margin");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PERCENTAGE, 10));
-	}
-
-	public void testInsertText3() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		// rule 3
-
-		rule = ruleList.item(2);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		assertEquals(":left", ((CSSPageRule) rule).getSelectorText());
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(2, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("margin-left");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 4));
-
-		value = declaration.getPropertyCSSValue("margin-right");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 3));
-	}
-
-	public void testInsertText4() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		// rule 4
-
-		rule = ruleList.item(3);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		assertEquals(":right", ((CSSPageRule) rule).getSelectorText());
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(2, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("margin-left");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 3));
-
-		value = declaration.getPropertyCSSValue("margin-right");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 4));
-	}
-
-	public void testInsertText5() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-		CSSValueList valueList;
-
-		// rule 5
-
-		rule = ruleList.item(4);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		assertEquals("narrow", ((CSSPageRule) rule).getSelectorText());
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(1, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("size");
-		assertTrue(value instanceof CSSValueList);
-
-		valueList = (CSSValueList) value;
-		assertEquals(2, valueList.getLength());
-
-		checkPrimitiveNumber(valueList.item(0), new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 9));
-		checkPrimitiveNumber(valueList.item(1), new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 18));
-	}
-
-	public void testInsertText6() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSPageRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(6, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		// rule 6
-
-		rule = ruleList.item(5);
-		assertEquals(CSSRule.PAGE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSPageRule);
-
-		assertEquals("rotated", ((CSSPageRule) rule).getSelectorText());
-
-		declaration = ((CSSPageRule) rule).getStyle();
-		assertEquals(1, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("size");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "landscape"));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java
deleted file mode 100644
index 31d2d7def..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleRuleTest.java
+++ /dev/null
@@ -1,222 +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.css.core.tests.model;
-
-import java.io.IOException;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleRule;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.css.CSSValue;
-
-public class CSSStyleRuleTest extends AbstractModelTest {
-	public void testInsertTextNumbers() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		rule = ruleList.item(0);
-		assertEquals(CSSRule.STYLE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSStyleRule);
-
-		declaration = ((CSSStyleRule) rule).getStyle();
-		assertEquals(20, declaration.getLength());
-
-		// 01
-		value = declaration.getPropertyCSSValue("NUMBER");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_NUMBER, 123.456f));
-
-		// 02
-		value = declaration.getPropertyCSSValue("PERCENTAGE");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PERCENTAGE, 123.456f));
-
-		// 03
-		value = declaration.getPropertyCSSValue("EMS");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_EMS, 123.456f));
-
-		// 04
-		value = declaration.getPropertyCSSValue("EXS");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_EXS, 123.456f));
-
-		// 05
-		value = declaration.getPropertyCSSValue("PX");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PX, +123.456f));
-		value = declaration.getPropertyCSSValue("PX2");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PX, -123f));
-
-
-		
-		// 06
-		value = declaration.getPropertyCSSValue("CM");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_CM, 123.456f));
-
-		// 07
-		value = declaration.getPropertyCSSValue("MM");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_MM, 123.456f));
-
-		// 08
-		value = declaration.getPropertyCSSValue("IN");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_IN, 123.456f));
-
-		// 09
-		value = declaration.getPropertyCSSValue("PT");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PT, 123.456f));
-
-		// 10
-		value = declaration.getPropertyCSSValue("PC");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_PC, 123.456f));
-
-		// 11
-		value = declaration.getPropertyCSSValue("DEG");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_DEG, -123.456f));
-
-		// 12
-		value = declaration.getPropertyCSSValue("RAD");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_RAD, 123.456f));
-
-		// 13
-		value = declaration.getPropertyCSSValue("GRAD");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_GRAD, 123.456f));
-
-		// 14
-		value = declaration.getPropertyCSSValue("MS");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_MS, 123.456f));
-
-		// 15
-		value = declaration.getPropertyCSSValue("S");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_S, 123.456f));
-
-		// 16
-		value = declaration.getPropertyCSSValue("HZ");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_HZ, 123.456f));
-
-		// 17
-		value = declaration.getPropertyCSSValue("KHZ");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_KHZ, 123.456f));
-
-		// 18
-		value = declaration.getPropertyCSSValue("DIMENSION");
-		checkPrimitiveNumber(value, new PrimitiveNumber(CSSPrimitiveValue.CSS_DIMENSION, -123.456f));
-
-		// 19
-		value = declaration.getPropertyCSSValue("INTEGER");
-		checkPrimitiveNumber(value, new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 123));
-	}
-
-	public void testInsertTextStrings() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		rule = ruleList.item(1);
-		assertEquals(CSSRule.STYLE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSStyleRule);
-
-		declaration = ((CSSStyleRule) rule).getStyle();
-		assertEquals(11, declaration.getLength());
-
-		// 01
-		value = declaration.getPropertyCSSValue("STRING");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_STRING, "string"));
-
-		// 02
-		value = declaration.getPropertyCSSValue("URI");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_URI, "http://www.ibm.com/"));
-
-		// 03
-		value = declaration.getPropertyCSSValue("IDENT");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_IDENT, "left"));
-
-		// 04
-		value = declaration.getPropertyCSSValue("HASH");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_HASH, "#abcdef"));
-
-		// 05
-		value = declaration.getPropertyCSSValue("URANGE");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_URANGE, "U+20A7"));
-
-		// 06
-		value = declaration.getPropertyCSSValue("SLASH");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_SLASH, "/"));
-
-		// 07
-		value = declaration.getPropertyCSSValue("COMMA");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_COMMA, ","));
-
-		// 08
-		value = declaration.getPropertyCSSValue("INHERIT_PRIMITIVE");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_INHERIT_PRIMITIVE, "inherit"));
-
-		// 09
-		value = declaration.getPropertyCSSValue("ATTR");
-		checkPrimitiveString(value, new PrimitiveString(CSSPrimitiveValue.CSS_ATTR, "KEY"));
-
-		// 10
-		value = declaration.getPropertyCSSValue("FORMAT");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_FORMAT, "truedoc"));
-
-		// 11
-		value = declaration.getPropertyCSSValue("LOCAL");
-		checkPrimitiveString(value, new PrimitiveString(ICSSPrimitiveValue.CSS_LOCAL, "Excelsior Roman"));
-	}
-
-	public void testInsertTextFunctions() throws IOException {
-		ICSSModel model = getModel();
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		structuredDocument.set(FileUtil.createString("src/org/eclipse/wst/css/core/tests/testfiles", "CSSStyleRuleTest.css"));
-
-		CSSStyleSheet sheet = (CSSStyleSheet) model.getDocument();
-		CSSRuleList ruleList = sheet.getCssRules();
-		assertEquals(3, ruleList.getLength());
-
-		CSSRule rule;
-		CSSStyleDeclaration declaration;
-		CSSValue value;
-
-		rule = ruleList.item(2);
-		assertEquals(CSSRule.STYLE_RULE, rule.getType());
-		assertTrue(rule instanceof CSSStyleRule);
-
-		declaration = ((CSSStyleRule) rule).getStyle();
-		assertEquals(3, declaration.getLength());
-
-		value = declaration.getPropertyCSSValue("COUNTER");
-		checkPrimitiveCounter(value, "par-num", "upper-roman", null);
-
-		value = declaration.getPropertyCSSValue("RECT");
-		checkPrimitiveRect(value, new Object[]{new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 12), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 34), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 56), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 78)});
-
-		value = declaration.getPropertyCSSValue("RGBCOLOR");
-		checkPrimitiveRgb(value, new Object[]{new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 255), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 128), new PrimitiveNumber(ICSSPrimitiveValue.CSS_INTEGER, 0)});
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java
deleted file mode 100644
index c23ceb4a3..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/CSSStyleSheetTest.java
+++ /dev/null
@@ -1,74 +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.css.core.tests.model;
-
-import org.w3c.dom.DOMException;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.css.CSSRuleList;
-import org.w3c.dom.css.CSSStyleSheet;
-
-
-public class CSSStyleSheetTest extends AbstractModelTest {
-	private final static String RULE_H1 = "H1 { color : red; }";
-	private final static String RULE_H2 = "H2 { color : red; }";
-	private final static String RULE_H3 = "H3 { color : red; }";
-
-	public void testInsertRule() {
-		CSSStyleSheet sheet = getStyleSheet();
-
-		assertEquals(0, sheet.insertRule(RULE_H3, 0));
-		assertEquals(0, sheet.insertRule(RULE_H1, 0));
-		assertEquals(1, sheet.insertRule(RULE_H2, 1));
-
-		CSSRuleList ruleList = sheet.getCssRules();
-		CSSRule rule;
-
-		rule = ruleList.item(0);
-		assertEquals(RULE_H1, rule.getCssText());
-		rule = ruleList.item(1);
-		assertEquals(RULE_H2, rule.getCssText());
-		rule = ruleList.item(2);
-		assertEquals(RULE_H3, rule.getCssText());
-
-	}
-
-	public void testDeleteRule() {
-		CSSStyleSheet sheet = getStyleSheet();
-
-		assertEquals(0, sheet.insertRule(RULE_H3, 0));
-		assertEquals(0, sheet.insertRule(RULE_H1, 0));
-		assertEquals(1, sheet.insertRule(RULE_H2, 1));
-
-		CSSRuleList ruleList;
-		CSSRule rule;
-
-		sheet.deleteRule(1);
-		ruleList = sheet.getCssRules();
-
-		rule = ruleList.item(0);
-		assertEquals(RULE_H1, rule.getCssText());
-		rule = ruleList.item(1);
-		assertEquals(RULE_H3, rule.getCssText());
-
-		sheet.deleteRule(1);
-		ruleList = sheet.getCssRules();
-
-		rule = ruleList.item(0);
-		assertEquals(RULE_H1, rule.getCssText());
-
-		sheet.deleteRule(0);
-
-		try {
-			sheet.deleteRule(0);
-		}
-		catch (DOMException e) {
-			assertEquals(DOMException.INDEX_SIZE_ERR, e.code);
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java
deleted file mode 100644
index 7adc2dba7..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/model/TestCSSDecl.java
+++ /dev/null
@@ -1,185 +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.css.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.encoding.CSSDocumentLoader;
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.util.CSSStyleDeclarationFactory;
-import org.eclipse.wst.css.core.internal.util.declaration.CSSPropertyContext;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.document.IDocumentLoader;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-public class TestCSSDecl extends TestCase {
-	public void testDecl() {
-		CSSPropertyContext context = new CSSPropertyContext();
-		ICSSStyleDeclaration decl = CSSStyleDeclarationFactory.getInstance().createStyleDeclaration();
-		context.initialize(decl);
-		decl.setCssText(getString() != null ? getString() : "");//$NON-NLS-1$
-	}
-
-	private String getString() {
-		return "body {}";
-	}
-
-	public void testCSSStyleDeclItem() {
-		String value = "color: blue;";
-		IDocumentLoader loader = new CSSDocumentLoader();
-		IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
-		((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-
-		sharedStructuredDocument.set(value);
-
-		IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
-		assertNotNull(region);
-
-	}
-
-	public void testCSSStyleDeclItemMODE_DECLARATION() {
-		String value = "color: blue;";
-		IDocumentLoader loader = new CSSDocumentLoader();
-		IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
-		((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION);
-
-		sharedStructuredDocument.set(value);
-
-		IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
-		assertNotNull(region);
-
-	}
-
-	public void testCSSStyleDeclItemSTYLE_SHEET() {
-		String value = "color: blue;";
-		IDocumentLoader loader = new CSSDocumentLoader();
-		IStructuredDocument sharedStructuredDocument = (IStructuredDocument) loader.createNewStructuredDocument();
-		((CSSSourceParser) sharedStructuredDocument.getParser()).setParserMode(CSSSourceParser.MODE_STYLESHEET);
-
-		sharedStructuredDocument.set(value);
-
-		IStructuredDocumentRegion region = sharedStructuredDocument.getFirstStructuredDocumentRegion();
-		assertNotNull(region);
-
-	}
-
-	public void testCSSModel() {
-
-		ICSSModel model = FileUtil.createModel();
-
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			structuredDocument.set(getHTMLDocumentText());
-
-			IStructuredDocumentRegion region = structuredDocument.getFirstStructuredDocumentRegion();
-			assertNotNull(region);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-
-	}
-
-	private String getHTMLDocumentText() {
-		String text = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\r\n" + 
-				"<HTML><HEAD>\r\n" + 
-				"<META http-equiv=\"Content-Type\" content=\"text/html; charset=iso-8859-1\">\r\n" + 
-				"<META http-equiv=\"Content-Style-Type\" content=\"text/css\">\r\n" + 
-				"<TITLE></TITLE>\r\n" + 
-				"<STYLE type=\"text/css\">\r\n" + 
-				"<!--\r\n" + 
-				"BODY{\r\n" + 
-				"  color : teal;\r\n" + 
-				"  background-color: #FFFF99;\r\n" + 
-				"}\r\n" + 
-				"H1{\r\n" + 
-				"  color : teal;\r\n" + 
-				"  text-align: center;\r\n" + 
-				"  padding-top: 10px;\r\n" + 
-				"  padding-right: 0px;\r\n" + 
-				"  padding-bottom: 10px;\r\n" + 
-				"  padding-left: 0px;\r\n" + 
-				"  border-top-style : solid;\r\n" + 
-				"  border-top-color : teal;\r\n" + 
-				"}\r\n" + 
-				"H2{\r\n" + 
-				"  color : teal;\r\n" + 
-				"  text-align: center;\r\n" + 
-				"  padding-top: 7px;\r\n" + 
-				"  padding-right: 0px;\r\n" + 
-				"  padding-bottom: 7px;\r\n" + 
-				"  padding-left: 0px;\r\n" + 
-				"  border-top-style : solid;\r\n" + 
-				"  border-top-color : teal;\r\n" + 
-				"}\r\n" + 
-				"H3{\r\n" + 
-				"  color : teal;\r\n" + 
-				"  text-align: center;\r\n" + 
-				"  padding-top: 4px;\r\n" + 
-				"  padding-right: 0px;\r\n" + 
-				"  padding-bottom: 4px;\r\n" + 
-				"  padding-left: 0px;\r\n" + 
-				"  border-top-style : solid;\r\n" + 
-				"  border-top-color : teal;\r\n" + 
-				"}\r\n" + 
-				"HR{\r\n" + 
-				"  color : teal;\r\n" + 
-				"  height: 3px;\r\n" + 
-				"}\r\n" + 
-				"P{\r\n" + 
-				"  color : teal;\r\n" + 
-				"}\r\n" + 
-				"TH{\r\n" + 
-				"  color: #FFFFCC;\r\n" + 
-				"  background-color : teal;\r\n" + 
-				"}\r\n" + 
-				"TD{\r\n" + 
-				"  color : black;\r\n" + 
-				"  background-color : white;\r\n" + 
-				"}\r\n" + 
-				"-->\r\n" + 
-				"</STYLE>\r\n" + 
-				"</HEAD><BODY>\r\n" + 
-				"<H1>Heading 1 Heading 1</H1>\r\n" + 
-				"<H2>Heading 2 Heading 2</H2>\r\n" + 
-				"<H3>Heading 3 Heading 3</H3>\r\n" + 
-				"<HR>\r\n" + 
-				"<P>Normal Text</P>\r\n" + 
-				"<P style=\"color : white; background-color : teal;\">Normal Text with inline style</P>\r\n" + 
-				"<HR>\r\n" + 
-				"<TABLE border=\"1\">\r\n" + 
-				"  <TBODY>\r\n" + 
-				"    <TR>\r\n" + 
-				"      <TH colspan=\"3\">Header Cell of Table</TH>\r\n" + 
-				"    </TR>\r\n" + 
-				"    <TR>\r\n" + 
-				"      <TD>Data Cell of Table</TD>\r\n" + 
-				"      <TD>Data Cell of Table</TD>\r\n" + 
-				"      <TD>Data Cell of Table</TD>\r\n" + 
-				"    </TR>\r\n" + 
-				"    <TR>\r\n" + 
-				"      <TD>Data Cell of Table</TD>\r\n" + 
-				"      <TD>Data Cell of Table</TD>\r\n" + 
-				"      <TD>Data Cell of Table</TD>\r\n" + 
-				"    </TR>\r\n" + 
-				"  </TBODY>\r\n" + 
-				"</TABLE>\r\n" + 
-				"</BODY></HTML>";
-		return text;
-	}
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java
deleted file mode 100644
index 4f20c0d9f..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSelectorTest.java
+++ /dev/null
@@ -1,817 +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.css.core.tests.source;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.document.CSSSelectorListImpl;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorCombinator;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-
-
-public class CSSSelectorTest extends TestCase {
-	public void testSelector01() {
-		ICSSSelectorList list = createSelectorList("H1, H2, H3");
-		checkSelectorList(list, "H1, H2, H3", 3, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 0, 0, 0);
-
-		selector = list.getSelector(1);
-		checkSelector(selector, "H2", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H2", false, 0, 0, 0, 0);
-
-		selector = list.getSelector(2);
-		checkSelector(selector, "H3", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H3", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector02() {
-		ICSSSelectorList list = createSelectorList("H\\\\, H\\1, H3");
-		checkSelectorList(list, "H\\\\, H\\1, H3", 3, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H\\\\", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H\\\\", false, 0, 0, 0, 0);
-
-		selector = list.getSelector(1);
-		checkSelector(selector, "H\\1", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H\\1", false, 0, 0, 0, 0);
-
-		selector = list.getSelector(2);
-		checkSelector(selector, "H3", 1, 1, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H3", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector03() {
-		ICSSSelectorList list = createSelectorList("H1.pastoral");
-		checkSelectorList(list, "H1.pastoral", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1.pastoral", 1, 101, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"pastoral"});
-	}
-
-	public void testSelector04() {
-		ICSSSelectorList list = createSelectorList("P.pastoral.marine");
-		checkSelectorList(list, "P.pastoral.marine", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "P.pastoral.marine", 1, 201, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "P", false, 0, 2, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"pastoral", "marine"});
-	}
-
-	public void testSelector05() {
-		ICSSSelectorList list = createSelectorList("*.warning");
-		checkSelectorList(list, "*.warning", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "*.warning", 1, 100, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"warning"});
-	}
-
-	public void testSelector06() {
-		ICSSSelectorList list = createSelectorList(".warning");
-		checkSelectorList(list, ".warning", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, ".warning", 1, 100, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"warning"});
-	}
-
-	public void testSelector07() {
-		ICSSSelectorList list = createSelectorList("*[lang=fr]");
-		checkSelectorList(list, "*[lang=fr]", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "*[lang=fr]", 1, 100, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 1, 0, 0, 0);
-		checkSimpleSelectorAttributes(item, new String[]{"lang=fr"});
-	}
-
-	public void testSelector08() {
-		ICSSSelectorList list = createSelectorList("[lang=fr]");
-		checkSelectorList(list, "[lang=fr]", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "[lang=fr]", 1, 100, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 1, 0, 0, 0);
-		checkSimpleSelectorAttributes(item, new String[]{"lang=fr"});
-	}
-
-	public void testSelector09() {
-		ICSSSelectorList list = createSelectorList("*#myid");
-		checkSelectorList(list, "*#myid", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "*#myid", 1, 10000, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 0, 0, 1, 0);
-		checkSimpleSelectorIDs(item, new String[]{"myid"});
-	}
-
-	public void testSelector10() {
-		ICSSSelectorList list = createSelectorList("#myid");
-		checkSelectorList(list, "#myid", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "#myid", 1, 10000, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 0, 1, 0);
-		checkSimpleSelectorIDs(item, new String[]{"myid"});
-	}
-
-	public void testSelector11() {
-		ICSSSelectorList list = createSelectorList("H1#z98y");
-		checkSelectorList(list, "H1#z98y", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1#z98y", 1, 10001, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 0, 1, 0);
-		checkSimpleSelectorIDs(item, new String[]{"z98y"});
-	}
-
-	public void testSelector12() {
-		ICSSSelectorList list = createSelectorList("H1 EM");
-		checkSelectorList(list, "H1 EM", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1 EM", 3, 2, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "EM", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector13() {
-		ICSSSelectorList list = createSelectorList("DIV * P");
-		checkSelectorList(list, "DIV * P", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "DIV * P", 5, 2, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "*", true, 0, 0, 0, 0);
-
-		item = selector.getItem(3);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(4);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector14() {
-		ICSSSelectorList list = createSelectorList("DIV P *[href]");
-		checkSelectorList(list, "DIV P *[href]", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "DIV P *[href]", 5, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-
-		item = selector.getItem(3);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(4);
-		checkSimpleSelector(item, "*", true, 1, 0, 0, 0);
-		checkSimpleSelectorAttributes(item, new String[]{"href"});
-	}
-
-	public void testSelector15() {
-		ICSSSelectorList list = createSelectorList("BODY > P");
-		checkSelectorList(list, "BODY > P", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "BODY > P", 3, 2, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "BODY", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector16() {
-		ICSSSelectorList list = createSelectorList("DIV OL>LI P");
-		checkSelectorList(list, "DIV OL > LI P", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "DIV OL > LI P", 7, 4, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "OL", false, 0, 0, 0, 0);
-
-		item = selector.getItem(3);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(4);
-		checkSimpleSelector(item, "LI", false, 0, 0, 0, 0);
-
-		item = selector.getItem(5);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(6);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector17() {
-		ICSSSelectorList list = createSelectorList("MATH + P");
-		checkSelectorList(list, "MATH + P", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "MATH + P", 3, 2, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "MATH", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector18() {
-		ICSSSelectorList list = createSelectorList("H1.opener + H2");
-		checkSelectorList(list, "H1.opener + H2", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1.opener + H2", 3, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"opener"});
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "H2", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector19() {
-		ICSSSelectorList list = createSelectorList("EXAMPLE[notation=decimal]");
-		checkSelectorList(list, "EXAMPLE[notation=decimal]", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "EXAMPLE[notation=decimal]", 1, 101, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "EXAMPLE", false, 1, 0, 0, 0);
-		checkSimpleSelectorAttributes(item, new String[]{"notation=decimal"});
-	}
-
-	public void testSelector20() {
-		ICSSSelectorList list = createSelectorList("SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]");
-		checkSelectorList(list, "SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "SPAN[hello=\"Cleveland\"][goodbye=\"Columbus\"]", 1, 201, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "SPAN", false, 2, 0, 0, 0);
-		checkSimpleSelectorAttributes(item, new String[]{"hello=\"Cleveland\"", "goodbye=\"Columbus\""});
-	}
-
-	public void testSelector21() {
-		ICSSSelectorList list = createSelectorList("DIV > P:first-child");
-		checkSelectorList(list, "DIV > P:first-child", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "DIV > P:first-child", 3, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "DIV", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
-	}
-
-	public void testSelector22() {
-		ICSSSelectorList list = createSelectorList("P:first-child EM");
-		checkSelectorList(list, "P:first-child EM", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "P:first-child EM", 3, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, " ", ICSSSelectorCombinator.DESCENDANT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "EM", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector23() {
-		ICSSSelectorList list = createSelectorList("* > A:first-child");
-		checkSelectorList(list, "* > A:first-child", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "* > A:first-child", 3, 101, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"first-child"});
-	}
-
-	public void testSelector24() {
-		ICSSSelectorList list = createSelectorList("A:link");
-		checkSelectorList(list, "A:link", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "A:link", 1, 101, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-	}
-
-	public void testSelector25() {
-		ICSSSelectorList list = createSelectorList(":link");
-		checkSelectorList(list, ":link", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, ":link", 1, 100, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-	}
-
-	public void testSelector26() {
-		ICSSSelectorList list = createSelectorList("A:focus:hover");
-		checkSelectorList(list, "A:focus:hover", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "A:focus:hover", 1, 201, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "A", false, 0, 0, 0, 2);
-		checkSimpleSelectorPseudoNames(item, new String[]{"focus", "hover"});
-	}
-
-	public void testSelector27() {
-		ICSSSelectorList list = createSelectorList("HTML:lang(de) > Q");
-		checkSelectorList(list, "HTML:lang(de) > Q", 1, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "HTML:lang(de) > Q", 3, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "HTML", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"lang(de)"});
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "Q", false, 0, 0, 0, 0);
-	}
-
-	public void testSelector28() {
-		ICSSSelectorList list = createSelectorList("P > A:link, A.external:visited");
-		checkSelectorList(list, "P > A:link, A.external:visited", 2, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "P > A:link", 3, 102, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "P", false, 0, 0, 0, 0);
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-
-		selector = list.getSelector(1);
-		checkSelector(selector, "A.external:visited", 1, 201, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "A", false, 0, 1, 0, 1);
-		checkSimpleSelectorClasses(item, new String[]{"external"});
-		checkSimpleSelectorPseudoNames(item, new String[]{"visited"});
-	}
-
-	public void testSelector29() {
-		ICSSSelectorList list = createSelectorList("P#hoge98 + *:hover > A:link, A.external:visited");
-		checkSelectorList(list, "P#hoge98 + *:hover > A:link, A.external:visited", 2, 0);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "P#hoge98 + *:hover > A:link", 5, 10202, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "P", false, 0, 0, 1, 0);
-		checkSimpleSelectorIDs(item, new String[]{"hoge98"});
-
-		item = selector.getItem(1);
-		checkSelectorCombinator(item, "+", ICSSSelectorCombinator.ADJACENT);
-
-		item = selector.getItem(2);
-		checkSimpleSelector(item, "*", true, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"hover"});
-
-		item = selector.getItem(3);
-		checkSelectorCombinator(item, ">", ICSSSelectorCombinator.CHILD);
-
-		item = selector.getItem(4);
-		checkSimpleSelector(item, "A", false, 0, 0, 0, 1);
-		checkSimpleSelectorPseudoNames(item, new String[]{"link"});
-
-		selector = list.getSelector(1);
-		checkSelector(selector, "A.external:visited", 1, 201, 0);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "A", false, 0, 1, 0, 1);
-		checkSimpleSelectorClasses(item, new String[]{"external"});
-		checkSimpleSelectorPseudoNames(item, new String[]{"visited"});
-	}
-
-	public void testSelector30() {
-		ICSSSelectorList list = createSelectorList("H1.123");
-		checkSelectorList(list, "H1.123", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1.123", 1, 101, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-	}
-
-	public void testSelector31() {
-		ICSSSelectorList list = createSelectorList("P.123.456");
-		checkSelectorList(list, "P.123.456", 1, 2);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "P.123.456", 1, 201, 2);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "P", false, 0, 2, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123", "456"});
-	}
-
-	public void testSelector32() {
-		ICSSSelectorList list = createSelectorList("*.123");
-		checkSelectorList(list, "*.123", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "*.123", 1, 100, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-	}
-
-	public void testSelector33() {
-		ICSSSelectorList list = createSelectorList(".123");
-		checkSelectorList(list, ".123", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, ".123", 1, 100, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-	}
-
-	public void testSelector34() {
-		ICSSSelectorList list = createSelectorList("H1.1x3");
-		checkSelectorList(list, "H1.1x3", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H1.1x3", 1, 101, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H1", false, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"1x3"});
-	}
-
-	public void testSelector35() {
-		ICSSSelectorList list = createSelectorList("H2.123#46");
-		checkSelectorList(list, "H2.123#46", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H2.123#46", 1, 10101, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H2", false, 0, 1, 1, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-		checkSimpleSelectorIDs(item, new String[]{"46"});
-	}
-
-	public void testSelector36() {
-		ICSSSelectorList list = createSelectorList("H3.1x3#4t2");
-		checkSelectorList(list, "H3.1x3#4t2", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "H3.1x3#4t2", 1, 10101, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "H3", false, 0, 1, 1, 0);
-		checkSimpleSelectorClasses(item, new String[]{"1x3"});
-		checkSimpleSelectorIDs(item, new String[]{"4t2"});
-	}
-
-	public void testSelector37() {
-		ICSSSelectorList list = createSelectorList("*.123");
-		checkSelectorList(list, "*.123", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, "*.123", 1, 100, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "*", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-	}
-
-	public void testSelector38() {
-		ICSSSelectorList list = createSelectorList(".123");
-		checkSelectorList(list, ".123", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, ".123", 1, 100, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123"});
-	}
-
-	public void testSelector39() {
-		ICSSSelectorList list = createSelectorList(".123f567");
-		checkSelectorList(list, ".123f567", 1, 1);
-
-		ICSSSelector selector;
-		ICSSSelectorItem item;
-
-		selector = list.getSelector(0);
-		checkSelector(selector, ".123f567", 1, 100, 1);
-
-		item = selector.getItem(0);
-		checkSimpleSelector(item, "", true, 0, 1, 0, 0);
-		checkSimpleSelectorClasses(item, new String[]{"123f567"});
-	}
-
-
-	private void checkSelectorList(ICSSSelectorList list, String formattedSource, int nSelectors, int nErrors) {
-		assertEquals(formattedSource, list.getString());
-		assertEquals(nSelectors, list.getLength());
-		assertEquals(nErrors, list.getErrorCount());
-	}
-
-	private void checkSelector(ICSSSelector selector, String formattedSource, int items, int specificity, int nErrors) {
-		assertEquals(formattedSource, selector.getString());
-		assertEquals(items, selector.getLength());
-		assertEquals(specificity, selector.getSpecificity());
-		assertEquals(nErrors, selector.getErrorCount());
-	}
-
-	private void checkSimpleSelector(ICSSSelectorItem selector, String formattedSource, boolean isUniversal, int nAttributes, int nClasses, int nIds, int nPseudoNames) {
-		assertTrue(selector instanceof ICSSSimpleSelector);
-		assertEquals(formattedSource, ((ICSSSimpleSelector) selector).getName());
-		assertEquals(isUniversal, ((ICSSSimpleSelector) selector).isUniversal());
-		assertEquals(nAttributes, ((ICSSSimpleSelector) selector).getNumOfAttributes());
-		assertEquals(nClasses, ((ICSSSimpleSelector) selector).getNumOfClasses());
-		assertEquals(nIds, ((ICSSSimpleSelector) selector).getNumOfIDs());
-		assertEquals(nPseudoNames, ((ICSSSimpleSelector) selector).getNumOfPseudoNames());
-	}
-
-	private void checkSimpleSelectorAttributes(ICSSSelectorItem selector, String[] items) {
-		int nItems = ((ICSSSimpleSelector) selector).getNumOfAttributes();
-		assertEquals(items.length, nItems);
-		for (int i = 0; i < nItems; i++) {
-			assertEquals(items[i], ((ICSSSimpleSelector) selector).getAttribute(i));
-		}
-	}
-
-	private void checkSimpleSelectorClasses(ICSSSelectorItem selector, String[] items) {
-		int nItems = ((ICSSSimpleSelector) selector).getNumOfClasses();
-		assertEquals(items.length, nItems);
-		for (int i = 0; i < nItems; i++) {
-			assertEquals(items[i], ((ICSSSimpleSelector) selector).getClass(i));
-		}
-	}
-
-	private void checkSimpleSelectorIDs(ICSSSelectorItem selector, String[] items) {
-		int nItems = ((ICSSSimpleSelector) selector).getNumOfIDs();
-		assertEquals(items.length, nItems);
-		for (int i = 0; i < nItems; i++) {
-			assertEquals(items[i], ((ICSSSimpleSelector) selector).getID(i));
-		}
-	}
-
-	private void checkSimpleSelectorPseudoNames(ICSSSelectorItem selector, String[] items) {
-		int nItems = ((ICSSSimpleSelector) selector).getNumOfPseudoNames();
-		assertEquals(items.length, nItems);
-		for (int i = 0; i < nItems; i++) {
-			assertEquals(items[i], ((ICSSSimpleSelector) selector).getPseudoName(i));
-		}
-	}
-
-	private void checkSelectorCombinator(ICSSSelectorItem combinator, String formattedSource, int combinatorType) {
-		assertTrue(combinator instanceof ICSSSelectorCombinator);
-		assertEquals(formattedSource, ((ICSSSelectorCombinator) combinator).getString());
-		assertEquals(combinatorType, ((ICSSSelectorCombinator) combinator).getCombinatorType());
-	}
-
-	private ICSSSelectorList createSelectorList(String str) {
-		return new CSSSelectorListImpl(str);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java
deleted file mode 100644
index 50291de1f..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSSourceParserTest.java
+++ /dev/null
@@ -1,217 +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.css.core.tests.source;
-
-import java.io.IOException;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-/**
- * 
- */
-public class CSSSourceParserTest extends TestCase {
-	public void testSourceOpen1() throws IOException {
-		sourceParserTest("sample01.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen2() throws IOException {
-		sourceParserTest("sample02.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen3() throws IOException {
-		sourceParserTest("sample03.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen4() throws IOException {
-		sourceParserTest("sample04.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen5() throws IOException {
-		sourceParserTest("sample05.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen6() throws IOException {
-		sourceParserTest("sample06.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceOpen7() throws IOException {
-		sourceParserTest("sample07.css", MODE_OPEN); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend1() throws IOException {
-		sourceParserTest("sample01.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend2() throws IOException {
-		sourceParserTest("sample02.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend3() throws IOException {
-		sourceParserTest("sample03.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend4() throws IOException {
-		sourceParserTest("sample04.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend5() throws IOException {
-		sourceParserTest("sample05.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend6() throws IOException {
-		sourceParserTest("sample06.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceAppend7() throws IOException {
-		sourceParserTest("sample07.css", MODE_APPEND); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert1() throws IOException {
-		sourceParserTest("sample01.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert2() throws IOException {
-		sourceParserTest("sample02.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert3() throws IOException {
-		sourceParserTest("sample03.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert4() throws IOException {
-		sourceParserTest("sample04.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert5() throws IOException {
-		sourceParserTest("sample05.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert6() throws IOException {
-		sourceParserTest("sample06.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	public void testSourceInsert7() throws IOException {
-		sourceParserTest("sample07.css", MODE_INSERT); //$NON-NLS-1$
-	}
-
-	private void sourceParserTest(String filename, String mode) throws IOException {
-		ICSSModel model = null;
-		if (mode.equals(MODE_OPEN)) {
-			model = readModelOpen(filename);
-		}
-		else if (mode.equals(MODE_APPEND)) {
-			model = readModelAppend(filename);
-		}
-		else if (mode.equals(MODE_INSERT)) {
-			model = readModelInsert(filename);
-		}
-		String result = dumpRegions(model.getStructuredDocument());
-		compareResult(result, "CSSSourceParserTest-" + filename); //$NON-NLS-1$
-		closeModel(model);
-	}
-
-	private ICSSModel readModelOpen(String filename) throws IOException {
-		String source = FileUtil.createString(FILES_DIR, filename);
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		document.replaceText(null, 0, 0, source);
-
-		return model;
-	}
-
-	private ICSSModel readModelAppend(String filename) throws IOException {
-		String source = FileUtil.createString(FILES_DIR, filename);
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		for (int i = 0; i < source.length(); i++) {
-			document.replaceText(null, i, 0, source.substring(i, i + 1));
-		}
-
-		return model;
-	}
-
-	private ICSSModel readModelInsert(String filename) throws IOException {
-		String source = FileUtil.createString(FILES_DIR, filename);
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		for (int i = 0; i < source.length(); i++) {
-			int textIndex = source.length() - i - 1;
-			document.replaceText(null, 0, 0, source.substring(textIndex, textIndex + 1));
-		}
-
-		return model;
-	}
-
-	private void closeModel(ICSSModel model) {
-		model.releaseFromEdit();
-	}
-
-	private String dumpRegions(IStructuredDocument document) {
-		StringBuffer buf = new StringBuffer();
-		buf.append(dumpRegions(document.getFirstStructuredDocumentRegion()));
-		return buf.toString();
-	}
-
-	private String dumpRegions(IStructuredDocumentRegion region) {
-		StringBuffer buf = new StringBuffer();
-		do {
-			buf.append(dumpOneRegion(region));
-			region = region.getNext();
-		}
-		while (region != null);
-
-		buf.append(FileUtil.commonEOL + "-------" + FileUtil.commonEOL); //$NON-NLS-1$
-
-		return buf.toString();
-	}
-
-	private String dumpOneRegion(IStructuredDocumentRegion documentRegion) {
-		StringBuffer buf = new StringBuffer();
-		buf.append(documentRegion.toString());
-		buf.append(FileUtil.commonEOL + "    "); //$NON-NLS-1$
-
-		ITextRegionList regionList = documentRegion.getRegions();
-		Iterator i = regionList.iterator();
-		while (i.hasNext()) {
-			ITextRegion textRegion = (ITextRegion) i.next();
-			buf.append(textRegion.toString());
-			buf.append(", "); //$NON-NLS-1$
-		}
-		buf.append(FileUtil.commonEOL); //$NON-NLS-1$
-		return buf.toString();
-	}
-
-	private boolean fDump = false;
-
-	private void compareResult(String actual, String filename) throws IOException {
-		if (fDump) {
-			FileUtil.dumpString(actual, RESULTS_DIR, filename);
-		}
-		else {
-			String result = FileUtil.createString(RESULTS_DIR, filename);
-			assertEquals(result, actual);
-		}
-	}
-
-	private static final String FILES_DIR = "src/org/eclipse/wst/css/core/tests/testfiles"; //$NON-NLS-1$
-	private static final String RESULTS_DIR = "src/org/eclipse/wst/css/core/tests/testfiles/results"; //$NON-NLS-1$
-	private static final String MODE_OPEN = "MODE_OPEN"; //$NON-NLS-1$
-	private static final String MODE_APPEND = "MODE_APPEND"; //$NON-NLS-1$
-	private static final String MODE_INSERT = "MODE_INSERT"; //$NON-NLS-1$
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java
deleted file mode 100644
index a7acb9dfd..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSTextParserTest.java
+++ /dev/null
@@ -1,105 +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.css.core.tests.source;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-
-
-public class CSSTextParserTest extends TestCase {
-	public void testText1() throws IOException {
-		textParserTest("sample01.css"); //$NON-NLS-1$
-	}
-
-	public void testText2() throws IOException {
-		textParserTest("sample02.css"); //$NON-NLS-1$
-	}
-
-	public void testText3() throws IOException {
-		textParserTest("sample03.css"); //$NON-NLS-1$
-	}
-
-	public void testText4() throws IOException {
-		textParserTest("sample04.css"); //$NON-NLS-1$
-	}
-
-	public void testText5() throws IOException {
-		textParserTest("sample05.css"); //$NON-NLS-1$
-	}
-
-	public void testText6() throws IOException {
-		textParserTest("sample06.css"); //$NON-NLS-1$
-	}
-
-	public void testText7() throws IOException {
-		textParserTest("sample07.css"); //$NON-NLS-1$
-	}
-
-	private void textParserTest(String filename) throws IOException {
-		String source = createString(filename); //$NON-NLS-1$
-		CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_STYLESHEET, source);
-		String result = dumpRegions(parser.getTokenList());
-		compareResult(result, "CSSTextParserTest-" + filename); //$NON-NLS-1$
-	}
-
-	private String createString(String filename) throws FileNotFoundException, IOException {
-		return FileUtil.createString(FILES_DIR, filename);
-	}
-
-	private String dumpRegions(List tokens) {
-		StringBuffer buf = new StringBuffer();
-		Iterator i = tokens.iterator();
-		while (i.hasNext()) {
-			buf.append(dumpOneRegion((CSSTextToken) i.next()));
-		}
-
-		buf.append(FileUtil.commonEOL + "-------" + FileUtil.commonEOL); //$NON-NLS-1$
-
-		return buf.toString();
-	}
-
-	private String dumpOneRegion(CSSTextToken token) {
-		StringBuffer buf = new StringBuffer();
-
-		buf.append("["); //$NON-NLS-1$
-		buf.append(token.image);
-		buf.append("] "); //$NON-NLS-1$
-		buf.append(token.kind);
-		buf.append(" - "); //$NON-NLS-1$
-		buf.append(token.start);
-		buf.append(", "); //$NON-NLS-1$
-		buf.append(token.length);
-
-		buf.append(FileUtil.commonEOL); //$NON-NLS-1$
-		return buf.toString();
-	}
-
-	private boolean fDump = false;
-
-	private void compareResult(String actual, String filename) throws IOException {
-		if (fDump) {
-			FileUtil.dumpString(actual, RESULTS_DIR, filename);
-		}
-		else {
-			String result = FileUtil.createString(RESULTS_DIR, filename);
-			assertEquals(result, actual);
-		}
-	}
-
-	private static final String FILES_DIR = "src/org/eclipse/wst/css/core/tests/testfiles"; //$NON-NLS-1$
-	private static final String RESULTS_DIR = "src/org/eclipse/wst/css/core/tests/testfiles/results";
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java
deleted file mode 100644
index 2a599aed4..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/source/CSSUrlTest.java
+++ /dev/null
@@ -1,261 +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.css.core.tests.source;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.parser.CSSSourceParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.tests.util.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-
-public class CSSUrlTest extends TestCase {
-
-	/**
-	 * Declaration: without quotes
-	 */
-	public void testDeclaration1() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		document.set("background-image: url(white space.gif);"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declaration: without quotes, with surrounded space
-	 */
-	public void testDeclaration2() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		document.set("background-image: url(  white space.gif  );"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declaration: with single quote
-	 */
-	public void testDeclaration3() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		document.set("background-image: url(\'white space.gif\');"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declaration: with double quote
-	 */
-	public void testDeclaration4() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		document.set("background-image: url(\"white space.gif\");"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declaration: two urls
-	 */
-	public void testDeclaration5() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		document.set("background-image: url(white space.gif); list-style-image: url(style image.gif);"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(2, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
-		assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Style rule: two urls
-	 */
-	public void testStyleRule1() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		document.set("LI { background-image: url(white space.gif);\r\nlist-style-image: url(style image.gif); }"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(2, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
-		assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Import rule and style rule: without quotes
-	 */
-	public void testSomeRules1() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		document.set("@import url(white space.css);LI { background-image: url(white space.gif);list-style-image: url(style image.gif); }"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-
-		assertEquals(3, urls.length);
-		assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
-		assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
-		assertEquals("white space.gif", urls[1].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[2].getType());
-		assertEquals("style image.gif", urls[2].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Declaration: Two urls but parenthesis are missed, so concatenated url
-	 * is identified. By adding parenthesis, urls are corrected.
-	 */
-	public void testFixError1() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		((CSSSourceParser) document.getParser()).setParserMode(CSSSourceParser.MODE_DECLARATION_VALUE);
-		// ____________01234567890123456789012345678901234567890123456789012345678901234567890123456789
-		document.set("background-image: url(white space.gif; list-style-image: urlstyle image.gif);"); //$NON-NLS-1$
-		UrlInfo[] urls = pickupUrl(document);
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif; list-style-image: urlstyle image.gif", urls[0].getUrl()); //$NON-NLS-1$
-
-		// correct first url
-		document.replaceText(null, 37, 0, ")"); //$NON-NLS-1$
-		urls = pickupUrl(document);
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-
-		// correct second url
-		document.replaceText(null, 61, 0, "("); //$NON-NLS-1$
-		urls = pickupUrl(document);
-		assertEquals(2, urls.length);
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[0].getType());
-		assertEquals("white space.gif", urls[0].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
-		assertEquals("style image.gif", urls[1].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Import rule and style rule: Two urls but parenthesis are missed, so
-	 * concatenated url is identified. By adding parenthesis, urls are
-	 * corrected.
-	 */
-	public void testFixError2() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		// ____________01234567890123456789012345678901234567890123456789012345678901234567890123456789
-		document.set("@import url(white space.css;LI { background-image: urlwhite space.gif); }"); //$NON-NLS-1$		
-		UrlInfo[] urls = pickupUrl(document);
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
-		assertEquals("white space.css;LI { background-image: urlwhite space.gif", urls[0].getUrl()); //$NON-NLS-1$
-
-		// correct first url
-		document.replaceText(null, 27, 0, ")"); //$NON-NLS-1$
-		urls = pickupUrl(document);
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
-		assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
-
-		// correct second url
-		document.replaceText(null, 55, 0, "("); //$NON-NLS-1$
-		urls = pickupUrl(document);
-		assertEquals(2, urls.length);
-		assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
-		assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
-		assertEquals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, urls[1].getType());
-		assertEquals("white space.gif", urls[1].getUrl()); //$NON-NLS-1$
-	}
-
-	/**
-	 * Import rule: Url has only one quote, so it is not identified as url. By
-	 * removing quote, url is corrected.
-	 */
-	public void testFixError3() {
-		ICSSModel model = FileUtil.createModel();
-		IStructuredDocument document = model.getStructuredDocument();
-		// ____________0123456789012345678901234567890
-		document.set("@import url(white space.css\");"); //$NON-NLS-1$		
-		UrlInfo[] urls = pickupUrl(document);
-		assertEquals(0, urls.length);
-
-		// correct url
-		document.replaceText(null, 27, 1, ""); //$NON-NLS-1$
-		urls = pickupUrl(document);
-		assertEquals(1, urls.length);
-		assertEquals(CSSRegionContexts.CSS_URI, urls[0].getType());
-		assertEquals("white space.css", urls[0].getUrl()); //$NON-NLS-1$
-	}
-
-
-	private UrlInfo[] pickupUrl(IStructuredDocument document) {
-		List urls = new ArrayList();
-		IStructuredDocumentRegion documentRegion = document.getFirstStructuredDocumentRegion();
-		while (documentRegion != null) {
-			ITextRegionList regionList = documentRegion.getRegions();
-			Iterator i = regionList.iterator();
-			while (i.hasNext()) {
-				ITextRegion textRegion = (ITextRegion) i.next();
-				String type = textRegion.getType();
-				if (type.equals(CSSRegionContexts.CSS_URI) || type.equals(CSSRegionContexts.CSS_DECLARATION_VALUE_URI)) {
-					urls.add(new UrlInfo(type, documentRegion.getFullText(textRegion)));
-				}
-			}
-			documentRegion = documentRegion.getNext();
-		}
-		return (UrlInfo[]) urls.toArray(new UrlInfo[urls.size()]);
-	}
-
-	private class UrlInfo {
-		UrlInfo(String type, String url) {
-			fType = type;
-			fUrl = CSSUtil.extractUriContents(url);
-		}
-
-		String getType() {
-			return fType;
-		}
-
-		String getUrl() {
-			return fUrl;
-		}
-
-		private String fType;
-		private String fUrl;
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css
deleted file mode 100644
index 09bd076c1..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSFontFaceRuleTest.css
+++ /dev/null
@@ -1,29 +0,0 @@
-@font-face {
-	font-family: "Swiss 721";
-	src: url("swiss721blk.pfr"); /* Swiss 721 black */
-	font-style: normal, italic;
-	font-weight: 800,900; /* note the interesting problem that
-	the 900 weight italic doesn�ft exist */
-}
-
-@font-face {
-	src: local("Palatino"),
-		local("Times New Roman"),
-		local("New York"),
-		local("Utopia"),
-		url("http://somewhere/free/font");
-	font-family: serif;
-	font-weight: 100, 200, 300, 400, 500;
-	font-style: normal;
-	font-variant: normal;
-	font-size: all
-}
-
-@font-face {
-	src: local("Alabama Italic"),
-	url(http://www.fonts.org/A/alabama-italic) format("truetype");
-	panose-1: 2 4 5 2 5 4 5 9 3 3;
-	font-family: Alabama, serif;
-	font-weight: 300, 400, 500;
-	font-style: italic, oblique;
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css
deleted file mode 100644
index b977f2cc5..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSPageRuleTest.css
+++ /dev/null
@@ -1,17 +0,0 @@
-@page {size: 8.5in 11in;margin: 2cm}
-
-@page {
-	size: auto; /* auto is the initial value */
-	margin: 10%;
-}
-
-@page :left {
-	margin-left: 4cm;
-	margin-right: 3cm;
-}
-@page :right {
-	margin-left: 3cm;
-	margin-right: 4cm;
-}
-
-@page narrow {size: 9cm 18cm}@page rotated {size: landscape}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css
deleted file mode 100644
index f5d68013a..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/CSSStyleRuleTest.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* primitive values */
-NUMBERS {
-	NUMBER: 123.456;
-	PERCENTAGE: 123.456%;
-	EMS: 123.456em;
-	EXS: 123.456ex;
-	PX: 123.456px;
-	PX2: -123px;
-	CM: 123.456cm;
-	MM: 123.456mm;
-	IN: 123.456in;
-	PT: 123.456pt;
-	PC: 123.456pc;
-	DEG: -123.456deg;
-	RAD: 123.456rad;
-	GRAD: 123.456grad;
-	MS: 123.456ms;
-	S: 123.456s;
-	HZ: 123.456Hz;
-	KHZ: 123.456kHz;
-	DIMENSION: -123.456zzz;
-	INTEGER: 123;
-}
-
-STRINGS {
-	STRING: "string";
-	URI: URL("http://www.ibm.com/");
-	IDENT: left;
-	HASH: #abcdef;
-	URANGE: U+20A7;
-	SLASH: /;
-	COMMA: ,;
-	INHERIT_PRIMITIVE: inherit;
-	ATTR: attr(KEY);
-	FORMAT: format("truedoc");
-	LOCAL: local("Excelsior Roman");
-}
-
-FUNCTIONS {
-	COUNTER: counter(par-num, upper-roman);
-	RECT: rect(12, 34, 56, 78);
-	RGBCOLOR: rgb(255, 128, 0);
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css
deleted file mode 100644
index e1ac2f766..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample01.css
+++ /dev/null
@@ -1,30 +0,0 @@
-[0, 3] (H1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3, 
-[3, 9] ({
-
-	)
-    ContextRegion--> LBRACE: 0-1/6, 
-[9, 21] (color: white)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[21, 24] (
-	)
-    ContextRegion--> S: 0-3, 
-[24, 25] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[25, 30] (
-
-	)
-    ContextRegion--> S: 0-5, 
-[30, 54] (background-color : black)
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_IDENT: 19-24, 
-[54, 59] (
-	
-)
-    ContextRegion--> S: 0-5, 
-[59, 60] (})
-    ContextRegion--> RBRACE: 0-1, 
-[60, 62] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css
deleted file mode 100644
index e867c985d..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample02.css
+++ /dev/null
@@ -1,41 +0,0 @@
-[0, 23] (@import url("hoge.css"))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23, 
-[23, 24] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[24, 26] (
-)
-    ContextRegion--> S: 0-2, 
-[26, 61] (@import /* comment */ url(hoge.css))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35, 
-[61, 62] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[62, 64] (
-)
-    ContextRegion--> S: 0-2, 
-[64, 96] (@import "hoge.css" /* comment */)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32, 
-[96, 97] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[97, 99] (
-)
-    ContextRegion--> S: 0-2, 
-[99, 155] (@IMPORT 'hoge.css' ,media1,media2,,media3 media4,media5 )
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> UNKNOWN: 19-20, ContextRegion--> MEDIUM: 20-26, ContextRegion--> MEDIA_SEPARATOR: 26-27, ContextRegion--> MEDIUM: 27-33, ContextRegion--> MEDIA_SEPARATOR: 33-34, ContextRegion--> UNKNOWN: 34-35, ContextRegion--> MEDIUM: 35-41/42, ContextRegion--> UNKNOWN: 42-48, ContextRegion--> MEDIA_SEPARATOR: 48-49, ContextRegion--> MEDIUM: 49-55/56, 
-[155, 169] (@import media6)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> UNKNOWN: 8-14, 
-[169, 170] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[170, 221] (
-
-<!-- /* hogehoge */
-
--->
-
-/* comment 2 */
-)
-    ContextRegion--> S: 0-4, ContextRegion--> CDO: 4-8/9, ContextRegion--> COMMENT: 9-23/27, ContextRegion--> CDC: 27-30/34, ContextRegion--> COMMENT: 34-49/51, 
-[221, 227] (kuso
-)
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/6, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css
deleted file mode 100644
index b057117d4..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample03.css
+++ /dev/null
@@ -1,102 +0,0 @@
-[0, 29] (@import url("../sample2.css"))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-29, 
-[29, 30] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[30, 57] (
-
-/* Sample Styles */
-
-)
-    ContextRegion--> S: 0-4, ContextRegion--> COMMENT: 4-23/27, 
-[57, 62] (BODY )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, 
-[62, 66] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[66, 79] (color : black)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13, 
-[79, 80] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[80, 83] (
-	)
-    ContextRegion--> S: 0-3, 
-[83, 120] (background-color : rgb(181, 253, 211))
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23, ContextRegion--> DECLARATION_VALUE_NUMBER: 23-26, ContextRegion--> DECLARATION_VALUE_OPERATOR: 26-27/28, ContextRegion--> DECLARATION_VALUE_NUMBER: 28-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_NUMBER: 33-36, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37, 
-[120, 121] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[121, 124] (
-	)
-    ContextRegion--> S: 0-3, 
-[124, 143] (text-align : center)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19, 
-[143, 144] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[144, 147] (
-	)
-    ContextRegion--> S: 0-3, 
-[147, 186] (font-family : "Heisei Mincho W3", serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-39, 
-[186, 188] (
-)
-    ContextRegion--> S: 0-2, 
-[188, 189] (})
-    ContextRegion--> RBRACE: 0-1, 
-[189, 193] (
-
-)
-    ContextRegion--> S: 0-4, 
-[193, 205] (@page :left )
-    ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12, 
-[205, 207] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[207, 224] (margin-left : 4cm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17, 
-[224, 225] ( )
-    ContextRegion--> S: 0-1, 
-[225, 226] (})
-    ContextRegion--> RBRACE: 0-1, 
-[226, 230] (
-
-)
-    ContextRegion--> S: 0-4, 
-[230, 243] (@media aural )
-    ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13, 
-[243, 247] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[247, 255] (P.heidi )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8, 
-[255, 260] ({
-		)
-    ContextRegion--> LBRACE: 0-1/5, 
-[260, 281] (azimuth : center-left)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-21, 
-[281, 282] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[282, 286] (
-		)
-    ContextRegion--> S: 0-4, 
-[286, 305] (elevation : 12.3deg)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19, 
-[305, 306] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[306, 310] (
-		)
-    ContextRegion--> S: 0-4, 
-[310, 327] (pause : 30ms 1.6s)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17, 
-[327, 330] (
-	)
-    ContextRegion--> S: 0-3, 
-[330, 331] (})
-    ContextRegion--> RBRACE: 0-1, 
-[331, 333] (
-)
-    ContextRegion--> S: 0-2, 
-[333, 334] (})
-    ContextRegion--> RBRACE: 0-1, 
-[334, 336] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css
deleted file mode 100644
index fdc36bf48..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample04.css
+++ /dev/null
@@ -1,554 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
-    ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21, 
-[21, 22] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[22, 26] (
-
-)
-    ContextRegion--> S: 0-4, 
-[26, 49] (@import url("hoge.css"))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23, 
-[49, 50] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[50, 52] (
-)
-    ContextRegion--> S: 0-2, 
-[52, 87] (@import /* comment */ url(hoge.css))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35, 
-[87, 88] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[88, 90] (
-)
-    ContextRegion--> S: 0-2, 
-[90, 122] (@import "hoge.css" /* comment */)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32, 
-[122, 123] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[123, 125] (
-)
-    ContextRegion--> S: 0-2, 
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> MEDIUM: 19-25, ContextRegion--> MEDIA_SEPARATOR: 25-26, ContextRegion--> MEDIUM: 26-32/33, ContextRegion--> MEDIA_SEPARATOR: 33-34/35, ContextRegion--> MEDIUM: 35-41, 
-[166, 167] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[167, 171] (
-
-)
-    ContextRegion--> S: 0-4, 
-[171, 184] (@media print )
-    ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13, 
-[184, 189] ({
-
-)
-    ContextRegion--> LBRACE: 0-1/5, 
-[189, 190] (})
-    ContextRegion--> RBRACE: 0-1, 
-[190, 194] (
-
-)
-    ContextRegion--> S: 0-4, 
-[194, 206] (@page :left )
-    ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12, 
-[206, 211] ({
-
-)
-    ContextRegion--> LBRACE: 0-1/5, 
-[211, 212] (})
-    ContextRegion--> RBRACE: 0-1, 
-[212, 216] (
-
-)
-    ContextRegion--> S: 0-4, 
-[216, 227] (h1, h2, h3 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11, 
-[227, 230] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[230, 253] (font-family: sans-serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-23, 
-[253, 255] (  )
-    ContextRegion--> S: 0-2, 
-[255, 256] (})
-    ContextRegion--> RBRACE: 0-1, 
-[256, 258] (
-)
-    ContextRegion--> S: 0-2, 
-[258, 264] (h1 em )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_COMBINATOR: 2-3, ContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6, 
-[264, 267] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[267, 278] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[278, 280] (  )
-    ContextRegion--> S: 0-2, 
-[280, 281] (})
-    ContextRegion--> RBRACE: 0-1, 
-[281, 283] (
-)
-    ContextRegion--> S: 0-2, 
-[283, 297] (div p *[href] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_COMBINATOR: 5-6, ContextRegion--> SELECTOR_UNIVERSAL: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14, 
-[297, 300] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[300, 311] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[311, 313] (  )
-    ContextRegion--> S: 0-2, 
-[313, 314] (})
-    ContextRegion--> RBRACE: 0-1, 
-[314, 316] (
-)
-    ContextRegion--> S: 0-2, 
-[316, 325] (body > P )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9, 
-[325, 328] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[328, 344] (line-height: 1.3)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-16, 
-[344, 346] (  )
-    ContextRegion--> S: 0-2, 
-[346, 347] (})
-    ContextRegion--> RBRACE: 0-1, 
-[347, 349] (
-)
-    ContextRegion--> S: 0-2, 
-[349, 361] (div ol>li p )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_COMBINATOR: 6-7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, ContextRegion--> SELECTOR_COMBINATOR: 9-10, ContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12, 
-[361, 363] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[363, 364] (})
-    ContextRegion--> RBRACE: 0-1, 
-[364, 366] (
-)
-    ContextRegion--> S: 0-2, 
-[366, 375] (math + p )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9, 
-[375, 378] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[378, 392] (text-indent: 0)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14, 
-[392, 394] (  )
-    ContextRegion--> S: 0-2, 
-[394, 395] (})
-    ContextRegion--> RBRACE: 0-1, 
-[395, 397] (
-)
-    ContextRegion--> S: 0-2, 
-[397, 412] (h1.opener + h2 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15, 
-[412, 415] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[415, 431] (margin-top: -5mm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-16, 
-[431, 433] (  )
-    ContextRegion--> S: 0-2, 
-[433, 434] (})
-    ContextRegion--> RBRACE: 0-1, 
-[434, 436] (
-)
-    ContextRegion--> S: 0-2, 
-[436, 446] (h1[title] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, ContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10, 
-[446, 449] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[449, 460] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[460, 461] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[461, 463] (  )
-    ContextRegion--> S: 0-2, 
-[463, 464] (})
-    ContextRegion--> RBRACE: 0-1, 
-[464, 466] (
-)
-    ContextRegion--> S: 0-2, 
-[466, 486] (span[class=example] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20, 
-[486, 489] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[489, 500] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[500, 501] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[501, 503] (  )
-    ContextRegion--> S: 0-2, 
-[503, 504] (})
-    ContextRegion--> RBRACE: 0-1, 
-[504, 506] (
-)
-    ContextRegion--> S: 0-2, 
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, ContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, ContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, ContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44, 
-[550, 553] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[553, 564] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[564, 565] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[565, 567] (  )
-    ContextRegion--> S: 0-2, 
-[567, 568] (})
-    ContextRegion--> RBRACE: 0-1, 
-[568, 570] (
-)
-    ContextRegion--> S: 0-2, 
-[570, 590] (a[rel~="copyright"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20, 
-[590, 593] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[593, 604] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[604, 606] (  )
-    ContextRegion--> S: 0-2, 
-[606, 607] (})
-    ContextRegion--> RBRACE: 0-1, 
-[607, 609] (
-)
-    ContextRegion--> S: 0-2, 
-[609, 638] (a[href="http://www.w3.org/"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, ContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29, 
-[638, 641] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[641, 652] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[652, 654] (  )
-    ContextRegion--> S: 0-2, 
-[654, 655] (})
-    ContextRegion--> RBRACE: 0-1, 
-[655, 657] (
-)
-    ContextRegion--> S: 0-2, 
-[657, 668] (*[lang=fr] )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, ContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11, 
-[668, 671] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[671, 685] (display : none)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-14, 
-[685, 687] (  )
-    ContextRegion--> S: 0-2, 
-[687, 688] (})
-    ContextRegion--> RBRACE: 0-1, 
-[688, 690] (
-)
-    ContextRegion--> S: 0-2, 
-[690, 704] (*[lang|="en"] )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14, 
-[704, 707] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[707, 718] (color : red)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11, 
-[718, 720] (  )
-    ContextRegion--> S: 0-2, 
-[720, 721] (})
-    ContextRegion--> RBRACE: 0-1, 
-[721, 723] (
-)
-    ContextRegion--> S: 0-2, 
-[723, 750] (DIALOGUE[character=romeo]
-)
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, ContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27, 
-[750, 753] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-41, ContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, ContextRegion--> DECLARATION_VALUE_IDENT: 43-47, 
-[800, 802] (  )
-    ContextRegion--> S: 0-2, 
-[802, 803] (})
-    ContextRegion--> RBRACE: 0-1, 
-[803, 805] (
-)
-    ContextRegion--> S: 0-2, 
-[805, 837] (DIALOGUE[ character = juliet ]
-)
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, ContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32, 
-[837, 840] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-28, ContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-46, 
-[886, 888] (  )
-    ContextRegion--> S: 0-2, 
-[888, 889] (})
-    ContextRegion--> RBRACE: 0-1, 
-[889, 891] (
-)
-    ContextRegion--> S: 0-2, 
-[891, 902] (*.pastoral )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10/11, 
-[902, 905] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[905, 917] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[917, 919] (  )
-    ContextRegion--> S: 0-2, 
-[919, 920] (})
-    ContextRegion--> RBRACE: 0-1, 
-[920, 922] (
-)
-    ContextRegion--> S: 0-2, 
-[922, 932] (.pastoral )
-    ContextRegion--> SELECTOR_CLASS: 0-9/10, 
-[932, 935] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[935, 947] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[947, 949] (  )
-    ContextRegion--> S: 0-2, 
-[949, 950] (})
-    ContextRegion--> RBRACE: 0-1, 
-[950, 952] (
-)
-    ContextRegion--> S: 0-2, 
-[952, 964] (H1.pastoral )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-11/12, 
-[964, 967] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[967, 979] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[979, 981] (  )
-    ContextRegion--> S: 0-2, 
-[981, 982] (})
-    ContextRegion--> RBRACE: 0-1, 
-[982, 984] (
-)
-    ContextRegion--> S: 0-2, 
-[984, 1002] (p.pastoral.marine )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_CLASS: 10-17/18, 
-[1002, 1005] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1005, 1017] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[1017, 1019] (  )
-    ContextRegion--> S: 0-2, 
-[1019, 1020] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1020, 1022] (
-)
-    ContextRegion--> S: 0-2, 
-[1022, 1034] (h1#chapter1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ID: 2-11/12, 
-[1034, 1037] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1037, 1055] (text-align: center)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-18, 
-[1055, 1057] (  )
-    ContextRegion--> S: 0-2, 
-[1057, 1058] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1058, 1060] (
-)
-    ContextRegion--> S: 0-2, 
-[1060, 1080] (div > p:first-child )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, ContextRegion--> SELECTOR_COMBINATOR: 4-5/6, ContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, ContextRegion--> SELECTOR_PSEUDO: 7-19/20, 
-[1080, 1083] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1083, 1097] (text-indent: 0)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14, 
-[1097, 1099] (  )
-    ContextRegion--> S: 0-2, 
-[1099, 1100] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1100, 1102] (
-)
-    ContextRegion--> S: 0-2, 
-[1102, 1119] (p:first-child em )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13, ContextRegion--> SELECTOR_COMBINATOR: 13-14, ContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17, 
-[1119, 1122] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1122, 1140] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1140, 1142] (  )
-    ContextRegion--> S: 0-2, 
-[1142, 1143] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1143, 1145] (
-)
-    ContextRegion--> S: 0-2, 
-[1145, 1163] (* > a:first-child )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, ContextRegion--> SELECTOR_COMBINATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_PSEUDO: 5-17/18, 
-[1163, 1166] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1166, 1184] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1184, 1186] (  )
-    ContextRegion--> S: 0-2, 
-[1186, 1187] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1187, 1189] (
-)
-    ContextRegion--> S: 0-2, 
-[1189, 1203] (a:first-child )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1203, 1206] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1206, 1224] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1224, 1226] (  )
-    ContextRegion--> S: 0-2, 
-[1226, 1227] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1227, 1229] (
-)
-    ContextRegion--> S: 0-2, 
-[1229, 1248] (a.external:visited )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_PSEUDO: 10-18/19, 
-[1248, 1251] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1251, 1262] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[1262, 1264] (  )
-    ContextRegion--> S: 0-2, 
-[1264, 1265] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1265, 1267] (
-)
-    ContextRegion--> S: 0-2, 
-[1267, 1281] (a:focus:hover )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-7, ContextRegion--> SELECTOR_PSEUDO: 7-13/14, 
-[1281, 1284] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1284, 1301] (background: white)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-17, 
-[1301, 1303] (  )
-    ContextRegion--> S: 0-2, 
-[1303, 1304] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1304, 1306] (
-)
-    ContextRegion--> S: 0-2, 
-[1306, 1320] (html:lang(fr) )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14, 
-[1320, 1323] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1323, 1340] (quotes: '<<' '>>')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17, 
-[1340, 1342] (  )
-    ContextRegion--> S: 0-2, 
-[1342, 1343] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1343, 1345] (
-)
-    ContextRegion--> S: 0-2, 
-[1345, 1359] (html:lang(de) )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14, 
-[1359, 1362] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33, 
-[1395, 1397] (  )
-    ContextRegion--> S: 0-2, 
-[1397, 1398] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1398, 1400] (
-)
-    ContextRegion--> S: 0-2, 
-[1400, 1414] (:lang(fr) > Q )
-    ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14, 
-[1414, 1417] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1417, 1434] (quotes: '<<' '>>')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17, 
-[1434, 1436] (  )
-    ContextRegion--> S: 0-2, 
-[1436, 1437] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1437, 1439] (
-)
-    ContextRegion--> S: 0-2, 
-[1439, 1453] (:lang(de) > Q )
-    ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14, 
-[1453, 1456] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33, 
-[1489, 1491] (  )
-    ContextRegion--> S: 0-2, 
-[1491, 1492] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1492, 1494] (
-)
-    ContextRegion--> S: 0-2, 
-[1494, 1509] (p:first-letter )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-14/15, 
-[1509, 1512] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1512, 1526] (font-size: 3em)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14, 
-[1526, 1527] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1527, 1528] ( )
-    ContextRegion--> S: 0-1, 
-[1528, 1547] (font-weight: normal)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19, 
-[1547, 1549] (  )
-    ContextRegion--> S: 0-2, 
-[1549, 1550] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1550, 1552] (
-)
-    ContextRegion--> S: 0-2, 
-[1552, 1569] (p.special:before )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-16/17, 
-[1569, 1571] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1571, 1591] (content: "Special! ")
-    ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-20, 
-[1591, 1592] ( )
-    ContextRegion--> S: 0-1, 
-[1592, 1593] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1593, 1595] (
-)
-    ContextRegion--> S: 0-2, 
-[1595, 1618] (p.special:first-letter )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-22/23, 
-[1618, 1620] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1620, 1634] (color: #ffd800)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14, 
-[1634, 1635] ( )
-    ContextRegion--> S: 0-1, 
-[1635, 1636] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1636, 1638] (
-)
-    ContextRegion--> S: 0-2, 
-[1638, 1643] (BODY )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, 
-[1643, 1645] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-43, ContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, ContextRegion--> DECLARATION_VALUE_IDENT: 45-51, ContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, ContextRegion--> DECLARATION_VALUE_IDENT: 53-58, 
-[1703, 1704] ( )
-    ContextRegion--> S: 0-1, 
-[1704, 1705] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1705, 1707] (
-)
-    ContextRegion--> S: 0-2, 
-[1707, 1721] (*:lang(ja-jp) )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1721, 1723] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, ContextRegion--> DECLARATION_VALUE_STRING: 20-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-45, 
-[1768, 1769] ( )
-    ContextRegion--> S: 0-1, 
-[1769, 1770] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1770, 1772] (
-)
-    ContextRegion--> S: 0-2, 
-[1772, 1786] (*:lang(zh-tw) )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1786, 1788] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, ContextRegion--> DECLARATION_VALUE_STRING: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_IDENT: 33-38, 
-[1826, 1827] ( )
-    ContextRegion--> S: 0-1, 
-[1827, 1828] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1828, 1830] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css
deleted file mode 100644
index fdc36bf48..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample05.css
+++ /dev/null
@@ -1,554 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
-    ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21, 
-[21, 22] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[22, 26] (
-
-)
-    ContextRegion--> S: 0-4, 
-[26, 49] (@import url("hoge.css"))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-23, 
-[49, 50] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[50, 52] (
-)
-    ContextRegion--> S: 0-2, 
-[52, 87] (@import /* comment */ url(hoge.css))
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> COMMENT: 8-21/22, ContextRegion--> URI: 22-35, 
-[87, 88] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[88, 90] (
-)
-    ContextRegion--> S: 0-2, 
-[90, 122] (@import "hoge.css" /* comment */)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> COMMENT: 19-32, 
-[122, 123] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[123, 125] (
-)
-    ContextRegion--> S: 0-2, 
-[125, 166] (@IMPORT 'hoge.css' media1,media2 , media3)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> STRING: 8-18/19, ContextRegion--> MEDIUM: 19-25, ContextRegion--> MEDIA_SEPARATOR: 25-26, ContextRegion--> MEDIUM: 26-32/33, ContextRegion--> MEDIA_SEPARATOR: 33-34/35, ContextRegion--> MEDIUM: 35-41, 
-[166, 167] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[167, 171] (
-
-)
-    ContextRegion--> S: 0-4, 
-[171, 184] (@media print )
-    ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13, 
-[184, 189] ({
-
-)
-    ContextRegion--> LBRACE: 0-1/5, 
-[189, 190] (})
-    ContextRegion--> RBRACE: 0-1, 
-[190, 194] (
-
-)
-    ContextRegion--> S: 0-4, 
-[194, 206] (@page :left )
-    ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12, 
-[206, 211] ({
-
-)
-    ContextRegion--> LBRACE: 0-1/5, 
-[211, 212] (})
-    ContextRegion--> RBRACE: 0-1, 
-[212, 216] (
-
-)
-    ContextRegion--> S: 0-4, 
-[216, 227] (h1, h2, h3 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10/11, 
-[227, 230] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[230, 253] (font-family: sans-serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-23, 
-[253, 255] (  )
-    ContextRegion--> S: 0-2, 
-[255, 256] (})
-    ContextRegion--> RBRACE: 0-1, 
-[256, 258] (
-)
-    ContextRegion--> S: 0-2, 
-[258, 264] (h1 em )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_COMBINATOR: 2-3, ContextRegion--> SELECTOR_ELEMENT_NAME: 3-5/6, 
-[264, 267] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[267, 278] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[278, 280] (  )
-    ContextRegion--> S: 0-2, 
-[280, 281] (})
-    ContextRegion--> RBRACE: 0-1, 
-[281, 283] (
-)
-    ContextRegion--> S: 0-2, 
-[283, 297] (div p *[href] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_COMBINATOR: 5-6, ContextRegion--> SELECTOR_UNIVERSAL: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_START: 7-8, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14, 
-[297, 300] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[300, 311] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[311, 313] (  )
-    ContextRegion--> S: 0-2, 
-[313, 314] (})
-    ContextRegion--> RBRACE: 0-1, 
-[314, 316] (
-)
-    ContextRegion--> S: 0-2, 
-[316, 325] (body > P )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9, 
-[325, 328] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[328, 344] (line-height: 1.3)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-16, 
-[344, 346] (  )
-    ContextRegion--> S: 0-2, 
-[346, 347] (})
-    ContextRegion--> RBRACE: 0-1, 
-[347, 349] (
-)
-    ContextRegion--> S: 0-2, 
-[349, 361] (div ol>li p )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_COMBINATOR: 3-4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_COMBINATOR: 6-7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-9, ContextRegion--> SELECTOR_COMBINATOR: 9-10, ContextRegion--> SELECTOR_ELEMENT_NAME: 10-11/12, 
-[361, 363] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[363, 364] (})
-    ContextRegion--> RBRACE: 0-1, 
-[364, 366] (
-)
-    ContextRegion--> S: 0-2, 
-[366, 375] (math + p )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, ContextRegion--> SELECTOR_COMBINATOR: 5-6/7, ContextRegion--> SELECTOR_ELEMENT_NAME: 7-8/9, 
-[375, 378] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[378, 392] (text-indent: 0)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14, 
-[392, 394] (  )
-    ContextRegion--> S: 0-2, 
-[394, 395] (})
-    ContextRegion--> RBRACE: 0-1, 
-[395, 397] (
-)
-    ContextRegion--> S: 0-2, 
-[397, 412] (h1.opener + h2 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14/15, 
-[412, 415] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[415, 431] (margin-top: -5mm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-16, 
-[431, 433] (  )
-    ContextRegion--> S: 0-2, 
-[433, 434] (})
-    ContextRegion--> RBRACE: 0-1, 
-[434, 436] (
-)
-    ContextRegion--> S: 0-2, 
-[436, 446] (h1[title] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ATTRIBUTE_START: 2-3, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 3-8, ContextRegion--> SELECTOR_ATTRIBUTE_END: 8-9/10, 
-[446, 449] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[449, 460] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[460, 461] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[461, 463] (  )
-    ContextRegion--> S: 0-2, 
-[463, 464] (})
-    ContextRegion--> RBRACE: 0-1, 
-[464, 466] (
-)
-    ContextRegion--> S: 0-2, 
-[466, 486] (span[class=example] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20, 
-[486, 489] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[489, 500] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[500, 501] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[501, 503] (  )
-    ContextRegion--> S: 0-2, 
-[503, 504] (})
-    ContextRegion--> RBRACE: 0-1, 
-[504, 506] (
-)
-    ContextRegion--> S: 0-2, 
-[506, 550] (span[hello="Cleveland"][goodbye="Columbus"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_ATTRIBUTE_START: 4-5, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 5-10, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 10-11, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 11-22, ContextRegion--> SELECTOR_ATTRIBUTE_END: 22-23, ContextRegion--> SELECTOR_ATTRIBUTE_START: 23-24, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 24-31, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 31-32, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 32-42, ContextRegion--> SELECTOR_ATTRIBUTE_END: 42-43/44, 
-[550, 553] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[553, 564] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[564, 565] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[565, 567] (  )
-    ContextRegion--> S: 0-2, 
-[567, 568] (})
-    ContextRegion--> RBRACE: 0-1, 
-[568, 570] (
-)
-    ContextRegion--> S: 0-2, 
-[570, 590] (a[rel~="copyright"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-5, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 5-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-18, ContextRegion--> SELECTOR_ATTRIBUTE_END: 18-19/20, 
-[590, 593] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[593, 604] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[604, 606] (  )
-    ContextRegion--> S: 0-2, 
-[606, 607] (})
-    ContextRegion--> RBRACE: 0-1, 
-[607, 609] (
-)
-    ContextRegion--> S: 0-2, 
-[609, 638] (a[href="http://www.w3.org/"] )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-27, ContextRegion--> SELECTOR_ATTRIBUTE_END: 27-28/29, 
-[638, 641] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[641, 652] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[652, 654] (  )
-    ContextRegion--> S: 0-2, 
-[654, 655] (})
-    ContextRegion--> RBRACE: 0-1, 
-[655, 657] (
-)
-    ContextRegion--> S: 0-2, 
-[657, 668] (*[lang=fr] )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-7, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 7-9, ContextRegion--> SELECTOR_ATTRIBUTE_END: 9-10/11, 
-[668, 671] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[671, 685] (display : none)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-14, 
-[685, 687] (  )
-    ContextRegion--> S: 0-2, 
-[687, 688] (})
-    ContextRegion--> RBRACE: 0-1, 
-[688, 690] (
-)
-    ContextRegion--> S: 0-2, 
-[690, 704] (*[lang|="en"] )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_ATTRIBUTE_START: 1-2, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 2-6, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 6-8, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 8-12, ContextRegion--> SELECTOR_ATTRIBUTE_END: 12-13/14, 
-[704, 707] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[707, 718] (color : red)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11, 
-[718, 720] (  )
-    ContextRegion--> S: 0-2, 
-[720, 721] (})
-    ContextRegion--> RBRACE: 0-1, 
-[721, 723] (
-)
-    ContextRegion--> S: 0-2, 
-[723, 750] (DIALOGUE[character=romeo]
-)
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 9-18, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 18-19, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 19-24, ContextRegion--> SELECTOR_ATTRIBUTE_END: 24-25/27, 
-[750, 753] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[753, 800] (voice-family: "Lawrence Olivier", charles, male)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_IDENT: 34-41, ContextRegion--> DECLARATION_VALUE_OPERATOR: 41-42/43, ContextRegion--> DECLARATION_VALUE_IDENT: 43-47, 
-[800, 802] (  )
-    ContextRegion--> S: 0-2, 
-[802, 803] (})
-    ContextRegion--> RBRACE: 0-1, 
-[803, 805] (
-)
-    ContextRegion--> S: 0-2, 
-[805, 837] (DIALOGUE[ character = juliet ]
-)
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-8, ContextRegion--> SELECTOR_ATTRIBUTE_START: 8-9/10, ContextRegion--> SELECTOR_ATTRIBUTE_NAME: 10-19/20, ContextRegion--> SELECTOR_ATTRIBUTE_OPERATOR: 20-21/22, ContextRegion--> SELECTOR_ATTRIBUTE_VALUE: 22-28/29, ContextRegion--> SELECTOR_ATTRIBUTE_END: 29-30/32, 
-[837, 840] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[840, 886] (voice-family: "Vivien Leigh", victoria, female)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-28, ContextRegion--> DECLARATION_VALUE_OPERATOR: 28-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-46, 
-[886, 888] (  )
-    ContextRegion--> S: 0-2, 
-[888, 889] (})
-    ContextRegion--> RBRACE: 0-1, 
-[889, 891] (
-)
-    ContextRegion--> S: 0-2, 
-[891, 902] (*.pastoral )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10/11, 
-[902, 905] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[905, 917] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[917, 919] (  )
-    ContextRegion--> S: 0-2, 
-[919, 920] (})
-    ContextRegion--> RBRACE: 0-1, 
-[920, 922] (
-)
-    ContextRegion--> S: 0-2, 
-[922, 932] (.pastoral )
-    ContextRegion--> SELECTOR_CLASS: 0-9/10, 
-[932, 935] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[935, 947] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[947, 949] (  )
-    ContextRegion--> S: 0-2, 
-[949, 950] (})
-    ContextRegion--> RBRACE: 0-1, 
-[950, 952] (
-)
-    ContextRegion--> S: 0-2, 
-[952, 964] (H1.pastoral )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_CLASS: 2-11/12, 
-[964, 967] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[967, 979] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[979, 981] (  )
-    ContextRegion--> S: 0-2, 
-[981, 982] (})
-    ContextRegion--> RBRACE: 0-1, 
-[982, 984] (
-)
-    ContextRegion--> S: 0-2, 
-[984, 1002] (p.pastoral.marine )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_CLASS: 10-17/18, 
-[1002, 1005] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1005, 1017] (color: green)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-12, 
-[1017, 1019] (  )
-    ContextRegion--> S: 0-2, 
-[1019, 1020] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1020, 1022] (
-)
-    ContextRegion--> S: 0-2, 
-[1022, 1034] (h1#chapter1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_ID: 2-11/12, 
-[1034, 1037] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1037, 1055] (text-align: center)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-18, 
-[1055, 1057] (  )
-    ContextRegion--> S: 0-2, 
-[1057, 1058] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1058, 1060] (
-)
-    ContextRegion--> S: 0-2, 
-[1060, 1080] (div > p:first-child )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3/4, ContextRegion--> SELECTOR_COMBINATOR: 4-5/6, ContextRegion--> SELECTOR_ELEMENT_NAME: 6-7, ContextRegion--> SELECTOR_PSEUDO: 7-19/20, 
-[1080, 1083] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1083, 1097] (text-indent: 0)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_NUMBER: 13-14, 
-[1097, 1099] (  )
-    ContextRegion--> S: 0-2, 
-[1099, 1100] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1100, 1102] (
-)
-    ContextRegion--> S: 0-2, 
-[1102, 1119] (p:first-child em )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13, ContextRegion--> SELECTOR_COMBINATOR: 13-14, ContextRegion--> SELECTOR_ELEMENT_NAME: 14-16/17, 
-[1119, 1122] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1122, 1140] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1140, 1142] (  )
-    ContextRegion--> S: 0-2, 
-[1142, 1143] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1143, 1145] (
-)
-    ContextRegion--> S: 0-2, 
-[1145, 1163] (* > a:first-child )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1/2, ContextRegion--> SELECTOR_COMBINATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-5, ContextRegion--> SELECTOR_PSEUDO: 5-17/18, 
-[1163, 1166] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1166, 1184] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1184, 1186] (  )
-    ContextRegion--> S: 0-2, 
-[1186, 1187] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1187, 1189] (
-)
-    ContextRegion--> S: 0-2, 
-[1189, 1203] (a:first-child )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1203, 1206] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1206, 1224] (font-weight : bold)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_IDENT: 14-18, 
-[1224, 1226] (  )
-    ContextRegion--> S: 0-2, 
-[1226, 1227] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1227, 1229] (
-)
-    ContextRegion--> S: 0-2, 
-[1229, 1248] (a.external:visited )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-10, ContextRegion--> SELECTOR_PSEUDO: 10-18/19, 
-[1248, 1251] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1251, 1262] (color: blue)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_IDENT: 7-11, 
-[1262, 1264] (  )
-    ContextRegion--> S: 0-2, 
-[1264, 1265] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1265, 1267] (
-)
-    ContextRegion--> S: 0-2, 
-[1267, 1281] (a:focus:hover )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-7, ContextRegion--> SELECTOR_PSEUDO: 7-13/14, 
-[1281, 1284] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1284, 1301] (background: white)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_IDENT: 12-17, 
-[1301, 1303] (  )
-    ContextRegion--> S: 0-2, 
-[1303, 1304] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1304, 1306] (
-)
-    ContextRegion--> S: 0-2, 
-[1306, 1320] (html:lang(fr) )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14, 
-[1320, 1323] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1323, 1340] (quotes: '<<' '>>')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17, 
-[1340, 1342] (  )
-    ContextRegion--> S: 0-2, 
-[1342, 1343] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1343, 1345] (
-)
-    ContextRegion--> S: 0-2, 
-[1345, 1359] (html:lang(de) )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4, ContextRegion--> SELECTOR_PSEUDO: 4-13/14, 
-[1359, 1362] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1362, 1395] (quotes: '>>' '<<' '\2039' '\203A')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33, 
-[1395, 1397] (  )
-    ContextRegion--> S: 0-2, 
-[1397, 1398] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1398, 1400] (
-)
-    ContextRegion--> S: 0-2, 
-[1400, 1414] (:lang(fr) > Q )
-    ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14, 
-[1414, 1417] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1417, 1434] (quotes: '<<' '>>')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17, 
-[1434, 1436] (  )
-    ContextRegion--> S: 0-2, 
-[1436, 1437] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1437, 1439] (
-)
-    ContextRegion--> S: 0-2, 
-[1439, 1453] (:lang(de) > Q )
-    ContextRegion--> SELECTOR_PSEUDO: 0-9/10, ContextRegion--> SELECTOR_COMBINATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-13/14, 
-[1453, 1456] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1456, 1489] (quotes: '>>' '<<' '\2039' '\203A')
-    ContextRegion--> DECLARATION_PROPERTY: 0-6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_STRING: 8-12/13, ContextRegion--> DECLARATION_VALUE_STRING: 13-17/18, ContextRegion--> DECLARATION_VALUE_STRING: 18-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-33, 
-[1489, 1491] (  )
-    ContextRegion--> S: 0-2, 
-[1491, 1492] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1492, 1494] (
-)
-    ContextRegion--> S: 0-2, 
-[1494, 1509] (p:first-letter )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-14/15, 
-[1509, 1512] ({  )
-    ContextRegion--> LBRACE: 0-1/3, 
-[1512, 1526] (font-size: 3em)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_DIMENSION: 11-14, 
-[1526, 1527] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1527, 1528] ( )
-    ContextRegion--> S: 0-1, 
-[1528, 1547] (font-weight: normal)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19, 
-[1547, 1549] (  )
-    ContextRegion--> S: 0-2, 
-[1549, 1550] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1550, 1552] (
-)
-    ContextRegion--> S: 0-2, 
-[1552, 1569] (p.special:before )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-16/17, 
-[1569, 1571] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1571, 1591] (content: "Special! ")
-    ContextRegion--> DECLARATION_PROPERTY: 0-7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-20, 
-[1591, 1592] ( )
-    ContextRegion--> S: 0-1, 
-[1592, 1593] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1593, 1595] (
-)
-    ContextRegion--> S: 0-2, 
-[1595, 1618] (p.special:first-letter )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-9, ContextRegion--> SELECTOR_PSEUDO: 9-22/23, 
-[1618, 1620] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1620, 1634] (color: #ffd800)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14, 
-[1634, 1635] ( )
-    ContextRegion--> S: 0-1, 
-[1635, 1636] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1636, 1638] (
-)
-    ContextRegion--> S: 0-2, 
-[1638, 1643] (BODY )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, 
-[1643, 1645] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1645, 1703] (font-family: Baskerville, "Heisi Mincho W3", Symbol, serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_STRING: 26-43, ContextRegion--> DECLARATION_VALUE_OPERATOR: 43-44/45, ContextRegion--> DECLARATION_VALUE_IDENT: 45-51, ContextRegion--> DECLARATION_VALUE_OPERATOR: 51-52/53, ContextRegion--> DECLARATION_VALUE_IDENT: 53-58, 
-[1703, 1704] ( )
-    ContextRegion--> S: 0-1, 
-[1704, 1705] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1705, 1707] (
-)
-    ContextRegion--> S: 0-2, 
-[1707, 1721] (*:lang(ja-jp) )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1721, 1723] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1723, 1768] (font: 900 14pt/16pt "Heisei Mincho W9", serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-19/20, ContextRegion--> DECLARATION_VALUE_STRING: 20-38, ContextRegion--> DECLARATION_VALUE_OPERATOR: 38-39/40, ContextRegion--> DECLARATION_VALUE_IDENT: 40-45, 
-[1768, 1769] ( )
-    ContextRegion--> S: 0-1, 
-[1769, 1770] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1770, 1772] (
-)
-    ContextRegion--> S: 0-2, 
-[1772, 1786] (*:lang(zh-tw) )
-    ContextRegion--> SELECTOR_UNIVERSAL: 0-1, ContextRegion--> SELECTOR_PSEUDO: 1-13/14, 
-[1786, 1788] ({ )
-    ContextRegion--> LBRACE: 0-1/2, 
-[1788, 1826] (font: 800 14pt/16.5pt "Li Sung", serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_NUMBER: 6-9/10, ContextRegion--> DECLARATION_VALUE_DIMENSION: 10-14, ContextRegion--> DECLARATION_VALUE_OPERATOR: 14-15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-21/22, ContextRegion--> DECLARATION_VALUE_STRING: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_IDENT: 33-38, 
-[1826, 1827] ( )
-    ContextRegion--> S: 0-1, 
-[1827, 1828] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1828, 1830] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css
deleted file mode 100644
index 6477cb07e..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample06.css
+++ /dev/null
@@ -1,68 +0,0 @@
-[0, 12] (declaration )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-11/12, 
-[12, 16] ({
-	)
-    ContextRegion--> LBRACE: 0-1/4, 
-[16, 33] (dimension : 100ex)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-17, 
-[33, 34] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[34, 37] (
-	)
-    ContextRegion--> S: 0-3, 
-[37, 133] (function : rect(100, 200, 300, 400), format("intellifont"), local("Excelsior Cyrilllic Upright"))
-    ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_FUNCTION: 11-16, ContextRegion--> DECLARATION_VALUE_NUMBER: 16-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_NUMBER: 21-24, ContextRegion--> DECLARATION_VALUE_OPERATOR: 24-25/26, ContextRegion--> DECLARATION_VALUE_NUMBER: 26-29, ContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, ContextRegion--> DECLARATION_VALUE_NUMBER: 31-34, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 34-35, ContextRegion--> DECLARATION_VALUE_OPERATOR: 35-36/37, ContextRegion--> DECLARATION_VALUE_FUNCTION: 37-44, ContextRegion--> DECLARATION_VALUE_STRING: 44-57, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 57-58, ContextRegion--> DECLARATION_VALUE_OPERATOR: 58-59/60, ContextRegion--> DECLARATION_VALUE_FUNCTION: 60-66, ContextRegion--> DECLARATION_VALUE_STRING: 66-95, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 95-96, 
-[133, 134] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[134, 137] (
-	)
-    ContextRegion--> S: 0-3, 
-[137, 151] (hash : #aabbcc)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_HASH: 7-14, 
-[151, 152] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[152, 155] (
-	)
-    ContextRegion--> S: 0-3, 
-[155, 166] (ident : any)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-11, 
-[166, 167] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[167, 170] (
-	)
-    ContextRegion--> S: 0-3, 
-[170, 184] (number : 99999)
-    ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_NUMBER: 9-14, 
-[184, 185] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[185, 188] (
-	)
-    ContextRegion--> S: 0-3, 
-[188, 205] (percentage : 100%)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_PERCENTAGE: 13-17, 
-[205, 206] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[206, 209] (
-	)
-    ContextRegion--> S: 0-3, 
-[209, 226] (string : "string")
-    ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_STRING: 9-17, 
-[226, 227] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[227, 230] (
-	)
-    ContextRegion--> S: 0-3, 
-[230, 268] (unicode-range : U+??, U+100-220, U+4??)
-    ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, ContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38, 
-[268, 269] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[269, 271] (
-)
-    ContextRegion--> S: 0-2, 
-[271, 272] (})
-    ContextRegion--> RBRACE: 0-1, 
-[272, 274] (
-)
-    ContextRegion--> S: 0-2, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css
deleted file mode 100644
index a4879a848..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSSourceParserTest-sample07.css
+++ /dev/null
@@ -1,454 +0,0 @@
-[0, 21] (@charset "ISO-8859-1")
-    ContextRegion--> CHARSET: 0-8/9, ContextRegion--> STRING: 9-21, 
-[21, 22] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[22, 26] (
-
-)
-    ContextRegion--> S: 0-4, 
-[26, 70] (@import url("../sample2.css") projection, tv)
-    ContextRegion--> IMPORT: 0-7/8, ContextRegion--> URI: 8-29/30, ContextRegion--> MEDIUM: 30-40, ContextRegion--> MEDIA_SEPARATOR: 40-41/42, ContextRegion--> MEDIUM: 42-44, 
-[70, 71] (;)
-    ContextRegion--> DELIMITER: 0-1, 
-[71, 75] (
-
-)
-    ContextRegion--> S: 0-4, 
-[75, 80] (BODY )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-4/5, 
-[80, 87] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[87, 100] (color : black)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13, 
-[100, 101] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[101, 107] (
-    )
-    ContextRegion--> S: 0-6, 
-[107, 126] (text-align : center)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19, 
-[126, 127] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[127, 133] (
-    )
-    ContextRegion--> S: 0-6, 
-[133, 172] (background-color : rgb( 181, 253, 211 ))
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_FUNCTION: 19-23/24, ContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, ContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, ContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_NUMBER: 34-37/38, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39, 
-[172, 174] (
-)
-    ContextRegion--> S: 0-2, 
-[174, 175] (})
-    ContextRegion--> RBRACE: 0-1, 
-[175, 179] (
-
-)
-    ContextRegion--> S: 0-4, 
-[179, 182] (UL )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3, 
-[182, 189] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[189, 202] (color : black)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13, 
-[202, 203] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[203, 209] (
-    )
-    ContextRegion--> S: 0-6, 
-[209, 251] (list-style-image : url("images/l_a01.gif"))
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_URI: 19-42, 
-[251, 252] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[252, 258] (
-    )
-    ContextRegion--> S: 0-6, 
-[258, 287] (list-style-position : outside)
-    ContextRegion--> DECLARATION_PROPERTY: 0-19/20, ContextRegion--> DECLARATION_SEPARATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_IDENT: 22-29, 
-[287, 289] (
-)
-    ContextRegion--> S: 0-2, 
-[289, 290] (})
-    ContextRegion--> RBRACE: 0-1, 
-[290, 294] (
-
-)
-    ContextRegion--> S: 0-4, 
-[294, 297] (H1 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2/3, 
-[297, 304] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[304, 317] (color : white)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_IDENT: 8-13, 
-[317, 318] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[318, 324] (
-    )
-    ContextRegion--> S: 0-6, 
-[324, 343] (text-align : center)
-    ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_IDENT: 13-19, 
-[343, 344] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[344, 350] (
-    )
-    ContextRegion--> S: 0-6, 
-[350, 377] (border-left-color : #996666)
-    ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_HASH: 20-27, 
-[377, 378] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[378, 384] (
-    )
-    ContextRegion--> S: 0-6, 
-[384, 401] (padding-top : 0px)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17, 
-[401, 402] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[402, 408] (
-    )
-    ContextRegion--> S: 0-6, 
-[408, 427] (padding-right : 1cm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_DIMENSION: 16-19, 
-[427, 428] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[428, 434] (
-    )
-    ContextRegion--> S: 0-6, 
-[434, 452] (padding-bottom : 2)
-    ContextRegion--> DECLARATION_PROPERTY: 0-14/15, ContextRegion--> DECLARATION_SEPARATOR: 15-16/17, ContextRegion--> DECLARATION_VALUE_NUMBER: 17-18, 
-[452, 453] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[453, 459] (
-    )
-    ContextRegion--> S: 0-6, 
-[459, 477] (padding-left : 3em)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_DIMENSION: 15-18, 
-[477, 478] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[478, 484] (
-    )
-    ContextRegion--> S: 0-6, 
-[484, 504] (border-style : solid)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-20, 
-[504, 505] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[505, 511] (
-    )
-    ContextRegion--> S: 0-6, 
-[511, 535] (border-top-width : 4.5ex)
-    ContextRegion--> DECLARATION_PROPERTY: 0-16/17, ContextRegion--> DECLARATION_SEPARATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_DIMENSION: 19-24, 
-[535, 536] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[536, 542] (
-    )
-    ContextRegion--> S: 0-6, 
-[542, 566] (border-right-width : 5in)
-    ContextRegion--> DECLARATION_PROPERTY: 0-18/19, ContextRegion--> DECLARATION_SEPARATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_DIMENSION: 21-24, 
-[566, 567] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[567, 573] (
-    )
-    ContextRegion--> S: 0-6, 
-[573, 601] (border-bottom-width : 6.02mm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-19/20, ContextRegion--> DECLARATION_SEPARATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_DIMENSION: 22-28, 
-[601, 602] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[602, 608] (
-    )
-    ContextRegion--> S: 0-6, 
-[608, 629] (border-left-width : 7)
-    ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_NUMBER: 20-21, 
-[629, 631] (
-)
-    ContextRegion--> S: 0-2, 
-[631, 632] (})
-    ContextRegion--> RBRACE: 0-1, 
-[632, 636] (
-
-)
-    ContextRegion--> S: 0-4, 
-[636, 646] (H1:before )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_PSEUDO: 2-9/10, 
-[646, 653] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[653, 697] (content : "Chapter " counter( chapter ) ". ")
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_STRING: 10-20/21, ContextRegion--> DECLARATION_VALUE_FUNCTION: 21-29/30, ContextRegion--> DECLARATION_VALUE_IDENT: 30-37/38, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 38-39/40, ContextRegion--> DECLARATION_VALUE_STRING: 40-44, 
-[697, 698] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[698, 704] (
-    )
-    ContextRegion--> S: 0-6, 
-[704, 731] (counter-increment : chapter)
-    ContextRegion--> DECLARATION_PROPERTY: 0-17/18, ContextRegion--> DECLARATION_SEPARATOR: 18-19/20, ContextRegion--> DECLARATION_VALUE_IDENT: 20-27, 
-[731, 732] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[732, 738] (
-    )
-    ContextRegion--> S: 0-6, 
-[738, 761] (counter-reset : section)
-    ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_IDENT: 16-23, 
-[761, 763] (
-)
-    ContextRegion--> S: 0-2, 
-[763, 764] (})
-    ContextRegion--> RBRACE: 0-1, 
-[764, 768] (
-
-)
-    ContextRegion--> S: 0-4, 
-[768, 779] (IMG:before )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_PSEUDO: 3-10/11, 
-[779, 780] ({)
-    ContextRegion--> LBRACE: 0-1, 
-[780, 799] (content : attr(alt))
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_FUNCTION: 10-15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-18, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 18-19, 
-[799, 800] (})
-    ContextRegion--> RBRACE: 0-1, 
-[800, 804] (
-
-)
-    ContextRegion--> S: 0-4, 
-[804, 815] (DIV.sample )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-3, ContextRegion--> SELECTOR_CLASS: 3-10/11, 
-[815, 822] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[822, 863] (font-family : "Robson Celtic", sans-serif)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-29, ContextRegion--> DECLARATION_VALUE_OPERATOR: 29-30/31, ContextRegion--> DECLARATION_VALUE_IDENT: 31-41, 
-[863, 864] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[864, 870] (
-    )
-    ContextRegion--> S: 0-6, 
-[870, 889] (position : absolute)
-    ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_IDENT: 11-19, 
-[889, 890] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[890, 896] (
-    )
-    ContextRegion--> S: 0-6, 
-[896, 910] (left : 833.5pc)
-    ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_DIMENSION: 7-14, 
-[910, 911] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[911, 917] (
-    )
-    ContextRegion--> S: 0-6, 
-[917, 926] (top : 90%)
-    ContextRegion--> DECLARATION_PROPERTY: 0-3/4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_PERCENTAGE: 6-9, 
-[926, 927] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[927, 933] (
-    )
-    ContextRegion--> S: 0-6, 
-[933, 946] (width : 100pt)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13, 
-[946, 947] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[947, 953] (
-    )
-    ContextRegion--> S: 0-6, 
-[953, 971] (height : 110.777px)
-    ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_DIMENSION: 9-18, 
-[971, 972] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[972, 978] (
-    )
-    ContextRegion--> S: 0-6, 
-[978, 1015] (clip : rect( -5px, 80px, 130px, 0px ))
-    ContextRegion--> DECLARATION_PROPERTY: 0-4/5, ContextRegion--> DECLARATION_SEPARATOR: 5-6/7, ContextRegion--> DECLARATION_VALUE_FUNCTION: 7-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17, ContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_DIMENSION: 19-23, ContextRegion--> DECLARATION_VALUE_OPERATOR: 23-24/25, ContextRegion--> DECLARATION_VALUE_DIMENSION: 25-30, ContextRegion--> DECLARATION_VALUE_OPERATOR: 30-31/32, ContextRegion--> DECLARATION_VALUE_DIMENSION: 32-35/36, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 36-37, 
-[1015, 1017] (
-)
-    ContextRegion--> S: 0-2, 
-[1017, 1018] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1018, 1022] (
-
-)
-    ContextRegion--> S: 0-4, 
-[1022, 1033] (@font-face )
-    ContextRegion--> FONT_FACE: 0-10/11, 
-[1033, 1040] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[1040, 1065] (font-family : "Swiss 721")
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_STRING: 14-25, 
-[1065, 1066] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1066, 1072] (
-    )
-    ContextRegion--> S: 0-6, 
-[1072, 1158] (src : url("swiss721t.pfr") format("intellifont"), local("Excelsior Cyrilllic Upright"))
-    ContextRegion--> DECLARATION_PROPERTY: 0-3/4, ContextRegion--> DECLARATION_SEPARATOR: 4-5/6, ContextRegion--> DECLARATION_VALUE_URI: 6-26/27, ContextRegion--> DECLARATION_VALUE_FUNCTION: 27-34, ContextRegion--> DECLARATION_VALUE_STRING: 34-47, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 47-48, ContextRegion--> DECLARATION_VALUE_OPERATOR: 48-49/50, ContextRegion--> DECLARATION_VALUE_FUNCTION: 50-56, ContextRegion--> DECLARATION_VALUE_STRING: 56-85, ContextRegion--> DECLARATION_VALUE_PARENTHESIS_CLOSE: 85-86, 
-[1158, 1159] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1159, 1165] (
-    )
-    ContextRegion--> S: 0-6, 
-[1165, 1203] (unicode-range : U+??, U+100-220, U+4??)
-    ContextRegion--> DECLARATION_PROPERTY: 0-13/14, ContextRegion--> DECLARATION_SEPARATOR: 14-15/16, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 16-20, ContextRegion--> DECLARATION_VALUE_OPERATOR: 20-21/22, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 22-31, ContextRegion--> DECLARATION_VALUE_OPERATOR: 31-32/33, ContextRegion--> DECLARATION_VALUE_UNICODE_RANGE: 33-38, 
-[1203, 1204] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1204, 1210] (
-    )
-    ContextRegion--> S: 0-6, 
-[1210, 1247] (font-weight : 100, 200, 300, 400, 500)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_NUMBER: 14-17, ContextRegion--> DECLARATION_VALUE_OPERATOR: 17-18/19, ContextRegion--> DECLARATION_VALUE_NUMBER: 19-22, ContextRegion--> DECLARATION_VALUE_OPERATOR: 22-23/24, ContextRegion--> DECLARATION_VALUE_NUMBER: 24-27, ContextRegion--> DECLARATION_VALUE_OPERATOR: 27-28/29, ContextRegion--> DECLARATION_VALUE_NUMBER: 29-32, ContextRegion--> DECLARATION_VALUE_OPERATOR: 32-33/34, ContextRegion--> DECLARATION_VALUE_NUMBER: 34-37, 
-[1247, 1249] (
-)
-    ContextRegion--> S: 0-2, 
-[1249, 1250] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1250, 1254] (
-
-)
-    ContextRegion--> S: 0-4, 
-[1254, 1266] (@page :left )
-    ContextRegion--> PAGE: 0-5/6, ContextRegion--> CSS_PAGE_SELECTOR: 6-11/12, 
-[1266, 1267] ({)
-    ContextRegion--> LBRACE: 0-1, 
-[1267, 1284] (margin-left : 4cm)
-    ContextRegion--> DECLARATION_PROPERTY: 0-11/12, ContextRegion--> DECLARATION_SEPARATOR: 12-13/14, ContextRegion--> DECLARATION_VALUE_DIMENSION: 14-17, 
-[1284, 1285] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1285, 1289] (
-
-)
-    ContextRegion--> S: 0-4, 
-[1289, 1302] (@media aural )
-    ContextRegion--> MEDIA: 0-6/7, ContextRegion--> MEDIUM: 7-12/13, 
-[1302, 1309] ({
-    )
-    ContextRegion--> LBRACE: 0-1/7, 
-[1309, 1332] (H1, H2, H3, H4, H5, H6 )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-2, ContextRegion--> SELECTOR_SEPARATOR: 2-3/4, ContextRegion--> SELECTOR_ELEMENT_NAME: 4-6, ContextRegion--> SELECTOR_SEPARATOR: 6-7/8, ContextRegion--> SELECTOR_ELEMENT_NAME: 8-10, ContextRegion--> SELECTOR_SEPARATOR: 10-11/12, ContextRegion--> SELECTOR_ELEMENT_NAME: 12-14, ContextRegion--> SELECTOR_SEPARATOR: 14-15/16, ContextRegion--> SELECTOR_ELEMENT_NAME: 16-18, ContextRegion--> SELECTOR_SEPARATOR: 18-19/20, ContextRegion--> SELECTOR_ELEMENT_NAME: 20-22/23, 
-[1332, 1343] ({
-        )
-    ContextRegion--> LBRACE: 0-1/11, 
-[1343, 1369] (voice-family : paul, child)
-    ContextRegion--> DECLARATION_PROPERTY: 0-12/13, ContextRegion--> DECLARATION_SEPARATOR: 13-14/15, ContextRegion--> DECLARATION_VALUE_IDENT: 15-19, ContextRegion--> DECLARATION_VALUE_OPERATOR: 19-20/21, ContextRegion--> DECLARATION_VALUE_IDENT: 21-26, 
-[1369, 1370] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1370, 1380] (
-        )
-    ContextRegion--> S: 0-10, 
-[1380, 1391] (stress : 20)
-    ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_NUMBER: 9-11, 
-[1391, 1392] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1392, 1402] (
-        )
-    ContextRegion--> S: 0-10, 
-[1402, 1415] (richness : 90)
-    ContextRegion--> DECLARATION_PROPERTY: 0-8/9, ContextRegion--> DECLARATION_SEPARATOR: 9-10/11, ContextRegion--> DECLARATION_VALUE_NUMBER: 11-13, 
-[1415, 1416] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1416, 1426] (
-        )
-    ContextRegion--> S: 0-10, 
-[1426, 1453] (cue-before : url("ping.au"))
-    ContextRegion--> DECLARATION_PROPERTY: 0-10/11, ContextRegion--> DECLARATION_SEPARATOR: 11-12/13, ContextRegion--> DECLARATION_VALUE_URI: 13-27, 
-[1453, 1459] (
-    )
-    ContextRegion--> S: 0-6, 
-[1459, 1460] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1460, 1466] (
-    )
-    ContextRegion--> S: 0-6, 
-[1466, 1474] (P.heidi )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8, 
-[1474, 1485] ({
-        )
-    ContextRegion--> LBRACE: 0-1/11, 
-[1485, 1506] (azimuth : center-left)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-21, 
-[1506, 1507] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1507, 1517] (
-        )
-    ContextRegion--> S: 0-10, 
-[1517, 1536] (elevation : 12.3deg)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-19, 
-[1536, 1537] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1537, 1547] (
-        )
-    ContextRegion--> S: 0-10, 
-[1547, 1564] (pause : 30ms 1.6s)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-12/13, ContextRegion--> DECLARATION_VALUE_DIMENSION: 13-17, 
-[1564, 1570] (
-    )
-    ContextRegion--> S: 0-6, 
-[1570, 1571] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1571, 1577] (
-    )
-    ContextRegion--> S: 0-6, 
-[1577, 1585] (P.peter )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-7/8, 
-[1585, 1596] ({
-        )
-    ContextRegion--> LBRACE: 0-1/11, 
-[1596, 1611] (azimuth : right)
-    ContextRegion--> DECLARATION_PROPERTY: 0-7/8, ContextRegion--> DECLARATION_SEPARATOR: 8-9/10, ContextRegion--> DECLARATION_VALUE_IDENT: 10-15, 
-[1611, 1612] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1612, 1622] (
-        )
-    ContextRegion--> S: 0-10, 
-[1622, 1642] (elevation : -0.36rad)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-20, 
-[1642, 1643] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1643, 1653] (
-        )
-    ContextRegion--> S: 0-10, 
-[1653, 1666] (pitch : 210Hz)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-13, 
-[1666, 1672] (
-    )
-    ContextRegion--> S: 0-6, 
-[1672, 1673] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1673, 1679] (
-    )
-    ContextRegion--> S: 0-6, 
-[1679, 1686] (P.goat )
-    ContextRegion--> SELECTOR_ELEMENT_NAME: 0-1, ContextRegion--> SELECTOR_CLASS: 1-6/7, 
-[1686, 1697] ({
-        )
-    ContextRegion--> LBRACE: 0-1/11, 
-[1697, 1712] (volume : x-soft)
-    ContextRegion--> DECLARATION_PROPERTY: 0-6/7, ContextRegion--> DECLARATION_SEPARATOR: 7-8/9, ContextRegion--> DECLARATION_VALUE_IDENT: 9-15, 
-[1712, 1713] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1713, 1723] (
-        )
-    ContextRegion--> S: 0-10, 
-[1723, 1741] (elevation : 66grad)
-    ContextRegion--> DECLARATION_PROPERTY: 0-9/10, ContextRegion--> DECLARATION_SEPARATOR: 10-11/12, ContextRegion--> DECLARATION_VALUE_DIMENSION: 12-18, 
-[1741, 1742] (;)
-    ContextRegion--> DECLARATION_DELIMITER: 0-1, 
-[1742, 1752] (
-        )
-    ContextRegion--> S: 0-10, 
-[1752, 1767] (pitch : 0.17kHz)
-    ContextRegion--> DECLARATION_PROPERTY: 0-5/6, ContextRegion--> DECLARATION_SEPARATOR: 6-7/8, ContextRegion--> DECLARATION_VALUE_DIMENSION: 8-15, 
-[1767, 1773] (
-    )
-    ContextRegion--> S: 0-6, 
-[1773, 1774] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1774, 1776] (
-)
-    ContextRegion--> S: 0-2, 
-[1776, 1777] (})
-    ContextRegion--> RBRACE: 0-1, 
-[1777, 1781] (
-
-)
-    ContextRegion--> S: 0-4, 
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css
deleted file mode 100644
index 403a43564..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample01.css
+++ /dev/null
@@ -1,29 +0,0 @@
-[H1] SELECTOR_ELEMENT_NAME - 0, 2
-[ ] S - 2, 1
-[{] LBRACE - 3, 1
-[
-
-	] S - 4, 5
-[color] DECLARATION_PROPERTY - 9, 5
-[:] DECLARATION_SEPARATOR - 14, 1
-[ ] S - 15, 1
-[white] DECLARATION_VALUE_IDENT - 16, 5
-[
-	] S - 21, 3
-[;] DECLARATION_DELIMITER - 24, 1
-[
-
-	] S - 25, 5
-[background-color] DECLARATION_PROPERTY - 30, 16
-[ ] S - 46, 1
-[:] DECLARATION_SEPARATOR - 47, 1
-[ ] S - 48, 1
-[black] DECLARATION_VALUE_IDENT - 49, 5
-[
-	
-] S - 54, 5
-[}] RBRACE - 59, 1
-[
-] S - 60, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css
deleted file mode 100644
index 34f6047fb..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample02.css
+++ /dev/null
@@ -1,73 +0,0 @@
-[@import] IMPORT - 0, 7
-[ ] S - 7, 1
-[url("hoge.css")] URI - 8, 15
-[;] DELIMITER - 23, 1
-[
-] S - 24, 2
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[/* comment */] COMMENT - 34, 13
-[ ] S - 47, 1
-[url(hoge.css)] URI - 48, 13
-[;] DELIMITER - 61, 1
-[
-] S - 62, 2
-[@import] IMPORT - 64, 7
-[ ] S - 71, 1
-["hoge.css"] STRING - 72, 10
-[ ] S - 82, 1
-[/* comment */] COMMENT - 83, 13
-[;] DELIMITER - 96, 1
-[
-] S - 97, 2
-[@IMPORT] IMPORT - 99, 7
-[ ] S - 106, 1
-['hoge.css'] STRING - 107, 10
-[ ] S - 117, 1
-[,] undefined - 118, 1
-[media1] MEDIUM - 119, 6
-[,] MEDIA_SEPARATOR - 125, 1
-[media2] MEDIUM - 126, 6
-[,] MEDIA_SEPARATOR - 132, 1
-[,] undefined - 133, 1
-[media3] MEDIUM - 134, 6
-[ ] S - 140, 1
-[m] undefined - 141, 1
-[e] undefined - 142, 1
-[d] undefined - 143, 1
-[i] undefined - 144, 1
-[a] undefined - 145, 1
-[4] undefined - 146, 1
-[,] MEDIA_SEPARATOR - 147, 1
-[media5] MEDIUM - 148, 6
-[ ] S - 154, 1
-[@import] IMPORT - 155, 7
-[ ] S - 162, 1
-[m] undefined - 163, 1
-[e] undefined - 164, 1
-[d] undefined - 165, 1
-[i] undefined - 166, 1
-[a] undefined - 167, 1
-[6] undefined - 168, 1
-[;] DELIMITER - 169, 1
-[
-
-] S - 170, 4
-[<!--] CDO - 174, 4
-[ ] S - 178, 1
-[/* hogehoge */] COMMENT - 179, 14
-[
-
-] S - 193, 4
-[-->] CDC - 197, 3
-[
-
-] S - 200, 4
-[/* comment 2 */] COMMENT - 204, 15
-[
-] S - 219, 2
-[kuso] SELECTOR_ELEMENT_NAME - 221, 4
-[
-] S - 225, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css
deleted file mode 100644
index 3a3e11cd9..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample03.css
+++ /dev/null
@@ -1,124 +0,0 @@
-[@import] IMPORT - 0, 7
-[ ] S - 7, 1
-[url("../sample2.css")] URI - 8, 21
-[;] DELIMITER - 29, 1
-[
-
-] S - 30, 4
-[/* Sample Styles */] COMMENT - 34, 19
-[
-
-] S - 53, 4
-[BODY] SELECTOR_ELEMENT_NAME - 57, 4
-[ ] S - 61, 1
-[{] LBRACE - 62, 1
-[
-	] S - 63, 3
-[color] DECLARATION_PROPERTY - 66, 5
-[ ] S - 71, 1
-[:] DECLARATION_SEPARATOR - 72, 1
-[ ] S - 73, 1
-[black] DECLARATION_VALUE_IDENT - 74, 5
-[;] DECLARATION_DELIMITER - 79, 1
-[
-	] S - 80, 3
-[background-color] DECLARATION_PROPERTY - 83, 16
-[ ] S - 99, 1
-[:] DECLARATION_SEPARATOR - 100, 1
-[ ] S - 101, 1
-[rgb(] DECLARATION_VALUE_FUNCTION - 102, 4
-[181] DECLARATION_VALUE_NUMBER - 106, 3
-[,] DECLARATION_VALUE_OPERATOR - 109, 1
-[ ] DECLARATION_VALUE_S - 110, 1
-[253] DECLARATION_VALUE_NUMBER - 111, 3
-[,] DECLARATION_VALUE_OPERATOR - 114, 1
-[ ] DECLARATION_VALUE_S - 115, 1
-[211] DECLARATION_VALUE_NUMBER - 116, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 119, 1
-[;] DECLARATION_DELIMITER - 120, 1
-[
-	] S - 121, 3
-[text-align] DECLARATION_PROPERTY - 124, 10
-[ ] S - 134, 1
-[:] DECLARATION_SEPARATOR - 135, 1
-[ ] S - 136, 1
-[center] DECLARATION_VALUE_IDENT - 137, 6
-[;] DECLARATION_DELIMITER - 143, 1
-[
-	] S - 144, 3
-[font-family] DECLARATION_PROPERTY - 147, 11
-[ ] S - 158, 1
-[:] DECLARATION_SEPARATOR - 159, 1
-[ ] S - 160, 1
-["Heisei Mincho W3"] DECLARATION_VALUE_STRING - 161, 18
-[,] DECLARATION_VALUE_OPERATOR - 179, 1
-[ ] DECLARATION_VALUE_S - 180, 1
-[serif] DECLARATION_VALUE_IDENT - 181, 5
-[
-] S - 186, 2
-[}] RBRACE - 188, 1
-[
-
-] S - 189, 4
-[@page] PAGE - 193, 5
-[ ] S - 198, 1
-[:left] CSS_PAGE_SELECTOR - 199, 5
-[ ] S - 204, 1
-[{] LBRACE - 205, 1
-[ ] S - 206, 1
-[margin-left] DECLARATION_PROPERTY - 207, 11
-[ ] S - 218, 1
-[:] DECLARATION_SEPARATOR - 219, 1
-[ ] S - 220, 1
-[4cm] DECLARATION_VALUE_DIMENSION - 221, 3
-[ ] S - 224, 1
-[}] RBRACE - 225, 1
-[
-
-] S - 226, 4
-[@media] MEDIA - 230, 6
-[ ] S - 236, 1
-[aural] MEDIUM - 237, 5
-[ ] S - 242, 1
-[{] LBRACE - 243, 1
-[
-	] S - 244, 3
-[P] SELECTOR_ELEMENT_NAME - 247, 1
-[.heidi] SELECTOR_CLASS - 248, 6
-[ ] S - 254, 1
-[{] LBRACE - 255, 1
-[
-		] S - 256, 4
-[azimuth] DECLARATION_PROPERTY - 260, 7
-[ ] S - 267, 1
-[:] DECLARATION_SEPARATOR - 268, 1
-[ ] S - 269, 1
-[center-left] DECLARATION_VALUE_IDENT - 270, 11
-[;] DECLARATION_DELIMITER - 281, 1
-[
-		] S - 282, 4
-[elevation] DECLARATION_PROPERTY - 286, 9
-[ ] S - 295, 1
-[:] DECLARATION_SEPARATOR - 296, 1
-[ ] S - 297, 1
-[12.3deg] DECLARATION_VALUE_DIMENSION - 298, 7
-[;] DECLARATION_DELIMITER - 305, 1
-[
-		] S - 306, 4
-[pause] DECLARATION_PROPERTY - 310, 5
-[ ] S - 315, 1
-[:] DECLARATION_SEPARATOR - 316, 1
-[ ] S - 317, 1
-[30ms] DECLARATION_VALUE_DIMENSION - 318, 4
-[ ] DECLARATION_VALUE_S - 322, 1
-[1.6s] DECLARATION_VALUE_DIMENSION - 323, 4
-[
-	] S - 327, 3
-[}] RBRACE - 330, 1
-[
-] S - 331, 2
-[}] RBRACE - 333, 1
-[
-] S - 334, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css
deleted file mode 100644
index 5d5d2e607..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample04.css
+++ /dev/null
@@ -1,706 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("hoge.css")] URI - 34, 15
-[;] DELIMITER - 49, 1
-[
-] S - 50, 2
-[@import] IMPORT - 52, 7
-[ ] S - 59, 1
-[/* comment */] COMMENT - 60, 13
-[ ] S - 73, 1
-[url(hoge.css)] URI - 74, 13
-[;] DELIMITER - 87, 1
-[
-] S - 88, 2
-[@import] IMPORT - 90, 7
-[ ] S - 97, 1
-["hoge.css"] STRING - 98, 10
-[ ] S - 108, 1
-[/* comment */] COMMENT - 109, 13
-[;] DELIMITER - 122, 1
-[
-] S - 123, 2
-[@IMPORT] IMPORT - 125, 7
-[ ] S - 132, 1
-['hoge.css'] STRING - 133, 10
-[ ] S - 143, 1
-[media1] MEDIUM - 144, 6
-[,] MEDIA_SEPARATOR - 150, 1
-[media2] MEDIUM - 151, 6
-[ ] S - 157, 1
-[,] MEDIA_SEPARATOR - 158, 1
-[ ] S - 159, 1
-[media3] MEDIUM - 160, 6
-[;] DELIMITER - 166, 1
-[
-
-] S - 167, 4
-[@media] MEDIA - 171, 6
-[ ] S - 177, 1
-[print] MEDIUM - 178, 5
-[ ] S - 183, 1
-[{] LBRACE - 184, 1
-[
-
-] S - 185, 4
-[}] RBRACE - 189, 1
-[
-
-] S - 190, 4
-[@page] PAGE - 194, 5
-[ ] S - 199, 1
-[:left] CSS_PAGE_SELECTOR - 200, 5
-[ ] S - 205, 1
-[{] LBRACE - 206, 1
-[
-
-] S - 207, 4
-[}] RBRACE - 211, 1
-[
-
-] S - 212, 4
-[h1] SELECTOR_ELEMENT_NAME - 216, 2
-[,] SELECTOR_SEPARATOR - 218, 1
-[ ] S - 219, 1
-[h2] SELECTOR_ELEMENT_NAME - 220, 2
-[,] SELECTOR_SEPARATOR - 222, 1
-[ ] S - 223, 1
-[h3] SELECTOR_ELEMENT_NAME - 224, 2
-[ ] S - 226, 1
-[{] LBRACE - 227, 1
-[  ] S - 228, 2
-[font-family] DECLARATION_PROPERTY - 230, 11
-[:] DECLARATION_SEPARATOR - 241, 1
-[ ] S - 242, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 243, 10
-[  ] S - 253, 2
-[}] RBRACE - 255, 1
-[
-] S - 256, 2
-[h1] SELECTOR_ELEMENT_NAME - 258, 2
-[ ] SELECTOR_COMBINATOR - 260, 1
-[em] SELECTOR_ELEMENT_NAME - 261, 2
-[ ] S - 263, 1
-[{] LBRACE - 264, 1
-[  ] S - 265, 2
-[color] DECLARATION_PROPERTY - 267, 5
-[:] DECLARATION_SEPARATOR - 272, 1
-[ ] S - 273, 1
-[blue] DECLARATION_VALUE_IDENT - 274, 4
-[  ] S - 278, 2
-[}] RBRACE - 280, 1
-[
-] S - 281, 2
-[div] SELECTOR_ELEMENT_NAME - 283, 3
-[ ] SELECTOR_COMBINATOR - 286, 1
-[p] SELECTOR_ELEMENT_NAME - 287, 1
-[ ] SELECTOR_COMBINATOR - 288, 1
-[*] SELECTOR_UNIVERSAL - 289, 1
-[[] SELECTOR_ATTRIBUTE_START - 290, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 291, 4
-[]] SELECTOR_ATTRIBUTE_END - 295, 1
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[  ] S - 298, 2
-[color] DECLARATION_PROPERTY - 300, 5
-[:] DECLARATION_SEPARATOR - 305, 1
-[ ] S - 306, 1
-[blue] DECLARATION_VALUE_IDENT - 307, 4
-[  ] S - 311, 2
-[}] RBRACE - 313, 1
-[
-] S - 314, 2
-[body] SELECTOR_ELEMENT_NAME - 316, 4
-[ ] S - 320, 1
-[>] SELECTOR_COMBINATOR - 321, 1
-[ ] S - 322, 1
-[P] SELECTOR_ELEMENT_NAME - 323, 1
-[ ] S - 324, 1
-[{] LBRACE - 325, 1
-[  ] S - 326, 2
-[line-height] DECLARATION_PROPERTY - 328, 11
-[:] DECLARATION_SEPARATOR - 339, 1
-[ ] S - 340, 1
-[1.3] DECLARATION_VALUE_NUMBER - 341, 3
-[  ] S - 344, 2
-[}] RBRACE - 346, 1
-[
-] S - 347, 2
-[div] SELECTOR_ELEMENT_NAME - 349, 3
-[ ] SELECTOR_COMBINATOR - 352, 1
-[ol] SELECTOR_ELEMENT_NAME - 353, 2
-[>] SELECTOR_COMBINATOR - 355, 1
-[li] SELECTOR_ELEMENT_NAME - 356, 2
-[ ] SELECTOR_COMBINATOR - 358, 1
-[p] SELECTOR_ELEMENT_NAME - 359, 1
-[ ] S - 360, 1
-[{] LBRACE - 361, 1
-[ ] S - 362, 1
-[}] RBRACE - 363, 1
-[
-] S - 364, 2
-[math] SELECTOR_ELEMENT_NAME - 366, 4
-[ ] S - 370, 1
-[+] SELECTOR_COMBINATOR - 371, 1
-[ ] S - 372, 1
-[p] SELECTOR_ELEMENT_NAME - 373, 1
-[ ] S - 374, 1
-[{] LBRACE - 375, 1
-[  ] S - 376, 2
-[text-indent] DECLARATION_PROPERTY - 378, 11
-[:] DECLARATION_SEPARATOR - 389, 1
-[ ] S - 390, 1
-[0] DECLARATION_VALUE_NUMBER - 391, 1
-[  ] S - 392, 2
-[}] RBRACE - 394, 1
-[
-] S - 395, 2
-[h1] SELECTOR_ELEMENT_NAME - 397, 2
-[.opener] SELECTOR_CLASS - 399, 7
-[ ] S - 406, 1
-[+] SELECTOR_COMBINATOR - 407, 1
-[ ] S - 408, 1
-[h2] SELECTOR_ELEMENT_NAME - 409, 2
-[ ] S - 411, 1
-[{] LBRACE - 412, 1
-[  ] S - 413, 2
-[margin-top] DECLARATION_PROPERTY - 415, 10
-[:] DECLARATION_SEPARATOR - 425, 1
-[ ] S - 426, 1
-[-5mm] DECLARATION_VALUE_DIMENSION - 427, 4
-[  ] S - 431, 2
-[}] RBRACE - 433, 1
-[
-] S - 434, 2
-[h1] SELECTOR_ELEMENT_NAME - 436, 2
-[[] SELECTOR_ATTRIBUTE_START - 438, 1
-[title] SELECTOR_ATTRIBUTE_NAME - 439, 5
-[]] SELECTOR_ATTRIBUTE_END - 444, 1
-[ ] S - 445, 1
-[{] LBRACE - 446, 1
-[  ] S - 447, 2
-[color] DECLARATION_PROPERTY - 449, 5
-[:] DECLARATION_SEPARATOR - 454, 1
-[ ] S - 455, 1
-[blue] DECLARATION_VALUE_IDENT - 456, 4
-[;] DECLARATION_DELIMITER - 460, 1
-[  ] S - 461, 2
-[}] RBRACE - 463, 1
-[
-] S - 464, 2
-[span] SELECTOR_ELEMENT_NAME - 466, 4
-[[] SELECTOR_ATTRIBUTE_START - 470, 1
-[class] SELECTOR_ATTRIBUTE_NAME - 471, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 476, 1
-[example] SELECTOR_ATTRIBUTE_VALUE - 477, 7
-[]] SELECTOR_ATTRIBUTE_END - 484, 1
-[ ] S - 485, 1
-[{] LBRACE - 486, 1
-[  ] S - 487, 2
-[color] DECLARATION_PROPERTY - 489, 5
-[:] DECLARATION_SEPARATOR - 494, 1
-[ ] S - 495, 1
-[blue] DECLARATION_VALUE_IDENT - 496, 4
-[;] DECLARATION_DELIMITER - 500, 1
-[  ] S - 501, 2
-[}] RBRACE - 503, 1
-[
-] S - 504, 2
-[span] SELECTOR_ELEMENT_NAME - 506, 4
-[[] SELECTOR_ATTRIBUTE_START - 510, 1
-[hello] SELECTOR_ATTRIBUTE_NAME - 511, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 516, 1
-["Cleveland"] SELECTOR_ATTRIBUTE_VALUE - 517, 11
-[]] SELECTOR_ATTRIBUTE_END - 528, 1
-[[] SELECTOR_ATTRIBUTE_START - 529, 1
-[goodbye] SELECTOR_ATTRIBUTE_NAME - 530, 7
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 537, 1
-["Columbus"] SELECTOR_ATTRIBUTE_VALUE - 538, 10
-[]] SELECTOR_ATTRIBUTE_END - 548, 1
-[ ] S - 549, 1
-[{] LBRACE - 550, 1
-[  ] S - 551, 2
-[color] DECLARATION_PROPERTY - 553, 5
-[:] DECLARATION_SEPARATOR - 558, 1
-[ ] S - 559, 1
-[blue] DECLARATION_VALUE_IDENT - 560, 4
-[;] DECLARATION_DELIMITER - 564, 1
-[  ] S - 565, 2
-[}] RBRACE - 567, 1
-[
-] S - 568, 2
-[a] SELECTOR_ELEMENT_NAME - 570, 1
-[[] SELECTOR_ATTRIBUTE_START - 571, 1
-[rel] SELECTOR_ATTRIBUTE_NAME - 572, 3
-[~=] SELECTOR_ATTRIBUTE_OPERATOR - 575, 2
-["copyright"] SELECTOR_ATTRIBUTE_VALUE - 577, 11
-[]] SELECTOR_ATTRIBUTE_END - 588, 1
-[ ] S - 589, 1
-[{] LBRACE - 590, 1
-[  ] S - 591, 2
-[color] DECLARATION_PROPERTY - 593, 5
-[:] DECLARATION_SEPARATOR - 598, 1
-[ ] S - 599, 1
-[blue] DECLARATION_VALUE_IDENT - 600, 4
-[  ] S - 604, 2
-[}] RBRACE - 606, 1
-[
-] S - 607, 2
-[a] SELECTOR_ELEMENT_NAME - 609, 1
-[[] SELECTOR_ATTRIBUTE_START - 610, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 611, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 615, 1
-["http://www.w3.org/"] SELECTOR_ATTRIBUTE_VALUE - 616, 20
-[]] SELECTOR_ATTRIBUTE_END - 636, 1
-[ ] S - 637, 1
-[{] LBRACE - 638, 1
-[  ] S - 639, 2
-[color] DECLARATION_PROPERTY - 641, 5
-[:] DECLARATION_SEPARATOR - 646, 1
-[ ] S - 647, 1
-[blue] DECLARATION_VALUE_IDENT - 648, 4
-[  ] S - 652, 2
-[}] RBRACE - 654, 1
-[
-] S - 655, 2
-[*] SELECTOR_UNIVERSAL - 657, 1
-[[] SELECTOR_ATTRIBUTE_START - 658, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 659, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 663, 1
-[fr] SELECTOR_ATTRIBUTE_VALUE - 664, 2
-[]] SELECTOR_ATTRIBUTE_END - 666, 1
-[ ] S - 667, 1
-[{] LBRACE - 668, 1
-[  ] S - 669, 2
-[display] DECLARATION_PROPERTY - 671, 7
-[ ] S - 678, 1
-[:] DECLARATION_SEPARATOR - 679, 1
-[ ] S - 680, 1
-[none] DECLARATION_VALUE_IDENT - 681, 4
-[  ] S - 685, 2
-[}] RBRACE - 687, 1
-[
-] S - 688, 2
-[*] SELECTOR_UNIVERSAL - 690, 1
-[[] SELECTOR_ATTRIBUTE_START - 691, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 692, 4
-[|=] SELECTOR_ATTRIBUTE_OPERATOR - 696, 2
-["en"] SELECTOR_ATTRIBUTE_VALUE - 698, 4
-[]] SELECTOR_ATTRIBUTE_END - 702, 1
-[ ] S - 703, 1
-[{] LBRACE - 704, 1
-[  ] S - 705, 2
-[color] DECLARATION_PROPERTY - 707, 5
-[ ] S - 712, 1
-[:] DECLARATION_SEPARATOR - 713, 1
-[ ] S - 714, 1
-[red] DECLARATION_VALUE_IDENT - 715, 3
-[  ] S - 718, 2
-[}] RBRACE - 720, 1
-[
-] S - 721, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 723, 8
-[[] SELECTOR_ATTRIBUTE_START - 731, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 732, 9
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 741, 1
-[romeo] SELECTOR_ATTRIBUTE_VALUE - 742, 5
-[]] SELECTOR_ATTRIBUTE_END - 747, 1
-[
-] S - 748, 2
-[{] LBRACE - 750, 1
-[  ] S - 751, 2
-[voice-family] DECLARATION_PROPERTY - 753, 12
-[:] DECLARATION_SEPARATOR - 765, 1
-[ ] S - 766, 1
-["Lawrence Olivier"] DECLARATION_VALUE_STRING - 767, 18
-[,] DECLARATION_VALUE_OPERATOR - 785, 1
-[ ] DECLARATION_VALUE_S - 786, 1
-[charles] DECLARATION_VALUE_IDENT - 787, 7
-[,] DECLARATION_VALUE_OPERATOR - 794, 1
-[ ] DECLARATION_VALUE_S - 795, 1
-[male] DECLARATION_VALUE_IDENT - 796, 4
-[  ] S - 800, 2
-[}] RBRACE - 802, 1
-[
-] S - 803, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 805, 8
-[[] SELECTOR_ATTRIBUTE_START - 813, 1
-[ ] S - 814, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 815, 9
-[ ] S - 824, 1
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 825, 1
-[ ] S - 826, 1
-[juliet] SELECTOR_ATTRIBUTE_VALUE - 827, 6
-[ ] S - 833, 1
-[]] SELECTOR_ATTRIBUTE_END - 834, 1
-[
-] S - 835, 2
-[{] LBRACE - 837, 1
-[  ] S - 838, 2
-[voice-family] DECLARATION_PROPERTY - 840, 12
-[:] DECLARATION_SEPARATOR - 852, 1
-[ ] S - 853, 1
-["Vivien Leigh"] DECLARATION_VALUE_STRING - 854, 14
-[,] DECLARATION_VALUE_OPERATOR - 868, 1
-[ ] DECLARATION_VALUE_S - 869, 1
-[victoria] DECLARATION_VALUE_IDENT - 870, 8
-[,] DECLARATION_VALUE_OPERATOR - 878, 1
-[ ] DECLARATION_VALUE_S - 879, 1
-[female] DECLARATION_VALUE_IDENT - 880, 6
-[  ] S - 886, 2
-[}] RBRACE - 888, 1
-[
-] S - 889, 2
-[*] SELECTOR_UNIVERSAL - 891, 1
-[.pastoral] SELECTOR_CLASS - 892, 9
-[ ] S - 901, 1
-[{] LBRACE - 902, 1
-[  ] S - 903, 2
-[color] DECLARATION_PROPERTY - 905, 5
-[:] DECLARATION_SEPARATOR - 910, 1
-[ ] S - 911, 1
-[green] DECLARATION_VALUE_IDENT - 912, 5
-[  ] S - 917, 2
-[}] RBRACE - 919, 1
-[
-] S - 920, 2
-[.pastoral] SELECTOR_CLASS - 922, 9
-[ ] S - 931, 1
-[{] LBRACE - 932, 1
-[  ] S - 933, 2
-[color] DECLARATION_PROPERTY - 935, 5
-[:] DECLARATION_SEPARATOR - 940, 1
-[ ] S - 941, 1
-[green] DECLARATION_VALUE_IDENT - 942, 5
-[  ] S - 947, 2
-[}] RBRACE - 949, 1
-[
-] S - 950, 2
-[H1] SELECTOR_ELEMENT_NAME - 952, 2
-[.pastoral] SELECTOR_CLASS - 954, 9
-[ ] S - 963, 1
-[{] LBRACE - 964, 1
-[  ] S - 965, 2
-[color] DECLARATION_PROPERTY - 967, 5
-[:] DECLARATION_SEPARATOR - 972, 1
-[ ] S - 973, 1
-[green] DECLARATION_VALUE_IDENT - 974, 5
-[  ] S - 979, 2
-[}] RBRACE - 981, 1
-[
-] S - 982, 2
-[p] SELECTOR_ELEMENT_NAME - 984, 1
-[.pastoral] SELECTOR_CLASS - 985, 9
-[.marine] SELECTOR_CLASS - 994, 7
-[ ] S - 1001, 1
-[{] LBRACE - 1002, 1
-[  ] S - 1003, 2
-[color] DECLARATION_PROPERTY - 1005, 5
-[:] DECLARATION_SEPARATOR - 1010, 1
-[ ] S - 1011, 1
-[green] DECLARATION_VALUE_IDENT - 1012, 5
-[  ] S - 1017, 2
-[}] RBRACE - 1019, 1
-[
-] S - 1020, 2
-[h1] SELECTOR_ELEMENT_NAME - 1022, 2
-[#chapter1] SELECTOR_ID - 1024, 9
-[ ] S - 1033, 1
-[{] LBRACE - 1034, 1
-[  ] S - 1035, 2
-[text-align] DECLARATION_PROPERTY - 1037, 10
-[:] DECLARATION_SEPARATOR - 1047, 1
-[ ] S - 1048, 1
-[center] DECLARATION_VALUE_IDENT - 1049, 6
-[  ] S - 1055, 2
-[}] RBRACE - 1057, 1
-[
-] S - 1058, 2
-[div] SELECTOR_ELEMENT_NAME - 1060, 3
-[ ] S - 1063, 1
-[>] SELECTOR_COMBINATOR - 1064, 1
-[ ] S - 1065, 1
-[p] SELECTOR_ELEMENT_NAME - 1066, 1
-[:first-child] SELECTOR_PSEUDO - 1067, 12
-[ ] S - 1079, 1
-[{] LBRACE - 1080, 1
-[  ] S - 1081, 2
-[text-indent] DECLARATION_PROPERTY - 1083, 11
-[:] DECLARATION_SEPARATOR - 1094, 1
-[ ] S - 1095, 1
-[0] DECLARATION_VALUE_NUMBER - 1096, 1
-[  ] S - 1097, 2
-[}] RBRACE - 1099, 1
-[
-] S - 1100, 2
-[p] SELECTOR_ELEMENT_NAME - 1102, 1
-[:first-child] SELECTOR_PSEUDO - 1103, 12
-[ ] SELECTOR_COMBINATOR - 1115, 1
-[em] SELECTOR_ELEMENT_NAME - 1116, 2
-[ ] S - 1118, 1
-[{] LBRACE - 1119, 1
-[  ] S - 1120, 2
-[font-weight] DECLARATION_PROPERTY - 1122, 11
-[ ] S - 1133, 1
-[:] DECLARATION_SEPARATOR - 1134, 1
-[ ] S - 1135, 1
-[bold] DECLARATION_VALUE_IDENT - 1136, 4
-[  ] S - 1140, 2
-[}] RBRACE - 1142, 1
-[
-] S - 1143, 2
-[*] SELECTOR_UNIVERSAL - 1145, 1
-[ ] S - 1146, 1
-[>] SELECTOR_COMBINATOR - 1147, 1
-[ ] S - 1148, 1
-[a] SELECTOR_ELEMENT_NAME - 1149, 1
-[:first-child] SELECTOR_PSEUDO - 1150, 12
-[ ] S - 1162, 1
-[{] LBRACE - 1163, 1
-[  ] S - 1164, 2
-[font-weight] DECLARATION_PROPERTY - 1166, 11
-[ ] S - 1177, 1
-[:] DECLARATION_SEPARATOR - 1178, 1
-[ ] S - 1179, 1
-[bold] DECLARATION_VALUE_IDENT - 1180, 4
-[  ] S - 1184, 2
-[}] RBRACE - 1186, 1
-[
-] S - 1187, 2
-[a] SELECTOR_ELEMENT_NAME - 1189, 1
-[:first-child] SELECTOR_PSEUDO - 1190, 12
-[ ] S - 1202, 1
-[{] LBRACE - 1203, 1
-[  ] S - 1204, 2
-[font-weight] DECLARATION_PROPERTY - 1206, 11
-[ ] S - 1217, 1
-[:] DECLARATION_SEPARATOR - 1218, 1
-[ ] S - 1219, 1
-[bold] DECLARATION_VALUE_IDENT - 1220, 4
-[  ] S - 1224, 2
-[}] RBRACE - 1226, 1
-[
-] S - 1227, 2
-[a] SELECTOR_ELEMENT_NAME - 1229, 1
-[.external] SELECTOR_CLASS - 1230, 9
-[:visited] SELECTOR_PSEUDO - 1239, 8
-[ ] S - 1247, 1
-[{] LBRACE - 1248, 1
-[  ] S - 1249, 2
-[color] DECLARATION_PROPERTY - 1251, 5
-[:] DECLARATION_SEPARATOR - 1256, 1
-[ ] S - 1257, 1
-[blue] DECLARATION_VALUE_IDENT - 1258, 4
-[  ] S - 1262, 2
-[}] RBRACE - 1264, 1
-[
-] S - 1265, 2
-[a] SELECTOR_ELEMENT_NAME - 1267, 1
-[:focus] SELECTOR_PSEUDO - 1268, 6
-[:hover] SELECTOR_PSEUDO - 1274, 6
-[ ] S - 1280, 1
-[{] LBRACE - 1281, 1
-[  ] S - 1282, 2
-[background] DECLARATION_PROPERTY - 1284, 10
-[:] DECLARATION_SEPARATOR - 1294, 1
-[ ] S - 1295, 1
-[white] DECLARATION_VALUE_IDENT - 1296, 5
-[  ] S - 1301, 2
-[}] RBRACE - 1303, 1
-[
-] S - 1304, 2
-[html] SELECTOR_ELEMENT_NAME - 1306, 4
-[:lang(fr)] SELECTOR_PSEUDO - 1310, 9
-[ ] S - 1319, 1
-[{] LBRACE - 1320, 1
-[  ] S - 1321, 2
-[quotes] DECLARATION_PROPERTY - 1323, 6
-[:] DECLARATION_SEPARATOR - 1329, 1
-[ ] S - 1330, 1
-['<<'] DECLARATION_VALUE_STRING - 1331, 4
-[ ] DECLARATION_VALUE_S - 1335, 1
-['>>'] DECLARATION_VALUE_STRING - 1336, 4
-[  ] S - 1340, 2
-[}] RBRACE - 1342, 1
-[
-] S - 1343, 2
-[html] SELECTOR_ELEMENT_NAME - 1345, 4
-[:lang(de)] SELECTOR_PSEUDO - 1349, 9
-[ ] S - 1358, 1
-[{] LBRACE - 1359, 1
-[  ] S - 1360, 2
-[quotes] DECLARATION_PROPERTY - 1362, 6
-[:] DECLARATION_SEPARATOR - 1368, 1
-[ ] S - 1369, 1
-['>>'] DECLARATION_VALUE_STRING - 1370, 4
-[ ] DECLARATION_VALUE_S - 1374, 1
-['<<'] DECLARATION_VALUE_STRING - 1375, 4
-[ ] DECLARATION_VALUE_S - 1379, 1
-['\2039'] DECLARATION_VALUE_STRING - 1380, 7
-[ ] DECLARATION_VALUE_S - 1387, 1
-['\203A'] DECLARATION_VALUE_STRING - 1388, 7
-[  ] S - 1395, 2
-[}] RBRACE - 1397, 1
-[
-] S - 1398, 2
-[:lang(fr)] SELECTOR_PSEUDO - 1400, 9
-[ ] S - 1409, 1
-[>] SELECTOR_COMBINATOR - 1410, 1
-[ ] S - 1411, 1
-[Q] SELECTOR_ELEMENT_NAME - 1412, 1
-[ ] S - 1413, 1
-[{] LBRACE - 1414, 1
-[  ] S - 1415, 2
-[quotes] DECLARATION_PROPERTY - 1417, 6
-[:] DECLARATION_SEPARATOR - 1423, 1
-[ ] S - 1424, 1
-['<<'] DECLARATION_VALUE_STRING - 1425, 4
-[ ] DECLARATION_VALUE_S - 1429, 1
-['>>'] DECLARATION_VALUE_STRING - 1430, 4
-[  ] S - 1434, 2
-[}] RBRACE - 1436, 1
-[
-] S - 1437, 2
-[:lang(de)] SELECTOR_PSEUDO - 1439, 9
-[ ] S - 1448, 1
-[>] SELECTOR_COMBINATOR - 1449, 1
-[ ] S - 1450, 1
-[Q] SELECTOR_ELEMENT_NAME - 1451, 1
-[ ] S - 1452, 1
-[{] LBRACE - 1453, 1
-[  ] S - 1454, 2
-[quotes] DECLARATION_PROPERTY - 1456, 6
-[:] DECLARATION_SEPARATOR - 1462, 1
-[ ] S - 1463, 1
-['>>'] DECLARATION_VALUE_STRING - 1464, 4
-[ ] DECLARATION_VALUE_S - 1468, 1
-['<<'] DECLARATION_VALUE_STRING - 1469, 4
-[ ] DECLARATION_VALUE_S - 1473, 1
-['\2039'] DECLARATION_VALUE_STRING - 1474, 7
-[ ] DECLARATION_VALUE_S - 1481, 1
-['\203A'] DECLARATION_VALUE_STRING - 1482, 7
-[  ] S - 1489, 2
-[}] RBRACE - 1491, 1
-[
-] S - 1492, 2
-[p] SELECTOR_ELEMENT_NAME - 1494, 1
-[:first-letter] SELECTOR_PSEUDO - 1495, 13
-[ ] S - 1508, 1
-[{] LBRACE - 1509, 1
-[  ] S - 1510, 2
-[font-size] DECLARATION_PROPERTY - 1512, 9
-[:] DECLARATION_SEPARATOR - 1521, 1
-[ ] S - 1522, 1
-[3em] DECLARATION_VALUE_DIMENSION - 1523, 3
-[;] DECLARATION_DELIMITER - 1526, 1
-[ ] S - 1527, 1
-[font-weight] DECLARATION_PROPERTY - 1528, 11
-[:] DECLARATION_SEPARATOR - 1539, 1
-[ ] S - 1540, 1
-[normal] DECLARATION_VALUE_IDENT - 1541, 6
-[  ] S - 1547, 2
-[}] RBRACE - 1549, 1
-[
-] S - 1550, 2
-[p] SELECTOR_ELEMENT_NAME - 1552, 1
-[.special] SELECTOR_CLASS - 1553, 8
-[:before] SELECTOR_PSEUDO - 1561, 7
-[ ] S - 1568, 1
-[{] LBRACE - 1569, 1
-[ ] S - 1570, 1
-[content] DECLARATION_PROPERTY - 1571, 7
-[:] DECLARATION_SEPARATOR - 1578, 1
-[ ] S - 1579, 1
-["Special! "] DECLARATION_VALUE_STRING - 1580, 11
-[ ] S - 1591, 1
-[}] RBRACE - 1592, 1
-[
-] S - 1593, 2
-[p] SELECTOR_ELEMENT_NAME - 1595, 1
-[.special] SELECTOR_CLASS - 1596, 8
-[:first-letter] SELECTOR_PSEUDO - 1604, 13
-[ ] S - 1617, 1
-[{] LBRACE - 1618, 1
-[ ] S - 1619, 1
-[color] DECLARATION_PROPERTY - 1620, 5
-[:] DECLARATION_SEPARATOR - 1625, 1
-[ ] S - 1626, 1
-[#ffd800] DECLARATION_VALUE_HASH - 1627, 7
-[ ] S - 1634, 1
-[}] RBRACE - 1635, 1
-[
-] S - 1636, 2
-[BODY] SELECTOR_ELEMENT_NAME - 1638, 4
-[ ] S - 1642, 1
-[{] LBRACE - 1643, 1
-[ ] S - 1644, 1
-[font-family] DECLARATION_PROPERTY - 1645, 11
-[:] DECLARATION_SEPARATOR - 1656, 1
-[ ] S - 1657, 1
-[Baskerville] DECLARATION_VALUE_IDENT - 1658, 11
-[,] DECLARATION_VALUE_OPERATOR - 1669, 1
-[ ] DECLARATION_VALUE_S - 1670, 1
-["Heisi Mincho W3"] DECLARATION_VALUE_STRING - 1671, 17
-[,] DECLARATION_VALUE_OPERATOR - 1688, 1
-[ ] DECLARATION_VALUE_S - 1689, 1
-[Symbol] DECLARATION_VALUE_IDENT - 1690, 6
-[,] DECLARATION_VALUE_OPERATOR - 1696, 1
-[ ] DECLARATION_VALUE_S - 1697, 1
-[serif] DECLARATION_VALUE_IDENT - 1698, 5
-[ ] S - 1703, 1
-[}] RBRACE - 1704, 1
-[
-] S - 1705, 2
-[*] SELECTOR_UNIVERSAL - 1707, 1
-[:lang(ja-jp)] SELECTOR_PSEUDO - 1708, 12
-[ ] S - 1720, 1
-[{] LBRACE - 1721, 1
-[ ] S - 1722, 1
-[font] DECLARATION_PROPERTY - 1723, 4
-[:] DECLARATION_SEPARATOR - 1727, 1
-[ ] S - 1728, 1
-[900] DECLARATION_VALUE_NUMBER - 1729, 3
-[ ] DECLARATION_VALUE_S - 1732, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1733, 4
-[/] DECLARATION_VALUE_OPERATOR - 1737, 1
-[16pt] DECLARATION_VALUE_DIMENSION - 1738, 4
-[ ] DECLARATION_VALUE_S - 1742, 1
-["Heisei Mincho W9"] DECLARATION_VALUE_STRING - 1743, 18
-[,] DECLARATION_VALUE_OPERATOR - 1761, 1
-[ ] DECLARATION_VALUE_S - 1762, 1
-[serif] DECLARATION_VALUE_IDENT - 1763, 5
-[ ] S - 1768, 1
-[}] RBRACE - 1769, 1
-[
-] S - 1770, 2
-[*] SELECTOR_UNIVERSAL - 1772, 1
-[:lang(zh-tw)] SELECTOR_PSEUDO - 1773, 12
-[ ] S - 1785, 1
-[{] LBRACE - 1786, 1
-[ ] S - 1787, 1
-[font] DECLARATION_PROPERTY - 1788, 4
-[:] DECLARATION_SEPARATOR - 1792, 1
-[ ] S - 1793, 1
-[800] DECLARATION_VALUE_NUMBER - 1794, 3
-[ ] DECLARATION_VALUE_S - 1797, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1798, 4
-[/] DECLARATION_VALUE_OPERATOR - 1802, 1
-[16.5pt] DECLARATION_VALUE_DIMENSION - 1803, 6
-[ ] DECLARATION_VALUE_S - 1809, 1
-["Li Sung"] DECLARATION_VALUE_STRING - 1810, 9
-[,] DECLARATION_VALUE_OPERATOR - 1819, 1
-[ ] DECLARATION_VALUE_S - 1820, 1
-[serif] DECLARATION_VALUE_IDENT - 1821, 5
-[ ] S - 1826, 1
-[}] RBRACE - 1827, 1
-[
-] S - 1828, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css
deleted file mode 100644
index 5d5d2e607..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample05.css
+++ /dev/null
@@ -1,706 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("hoge.css")] URI - 34, 15
-[;] DELIMITER - 49, 1
-[
-] S - 50, 2
-[@import] IMPORT - 52, 7
-[ ] S - 59, 1
-[/* comment */] COMMENT - 60, 13
-[ ] S - 73, 1
-[url(hoge.css)] URI - 74, 13
-[;] DELIMITER - 87, 1
-[
-] S - 88, 2
-[@import] IMPORT - 90, 7
-[ ] S - 97, 1
-["hoge.css"] STRING - 98, 10
-[ ] S - 108, 1
-[/* comment */] COMMENT - 109, 13
-[;] DELIMITER - 122, 1
-[
-] S - 123, 2
-[@IMPORT] IMPORT - 125, 7
-[ ] S - 132, 1
-['hoge.css'] STRING - 133, 10
-[ ] S - 143, 1
-[media1] MEDIUM - 144, 6
-[,] MEDIA_SEPARATOR - 150, 1
-[media2] MEDIUM - 151, 6
-[ ] S - 157, 1
-[,] MEDIA_SEPARATOR - 158, 1
-[ ] S - 159, 1
-[media3] MEDIUM - 160, 6
-[;] DELIMITER - 166, 1
-[
-
-] S - 167, 4
-[@media] MEDIA - 171, 6
-[ ] S - 177, 1
-[print] MEDIUM - 178, 5
-[ ] S - 183, 1
-[{] LBRACE - 184, 1
-[
-
-] S - 185, 4
-[}] RBRACE - 189, 1
-[
-
-] S - 190, 4
-[@page] PAGE - 194, 5
-[ ] S - 199, 1
-[:left] CSS_PAGE_SELECTOR - 200, 5
-[ ] S - 205, 1
-[{] LBRACE - 206, 1
-[
-
-] S - 207, 4
-[}] RBRACE - 211, 1
-[
-
-] S - 212, 4
-[h1] SELECTOR_ELEMENT_NAME - 216, 2
-[,] SELECTOR_SEPARATOR - 218, 1
-[ ] S - 219, 1
-[h2] SELECTOR_ELEMENT_NAME - 220, 2
-[,] SELECTOR_SEPARATOR - 222, 1
-[ ] S - 223, 1
-[h3] SELECTOR_ELEMENT_NAME - 224, 2
-[ ] S - 226, 1
-[{] LBRACE - 227, 1
-[  ] S - 228, 2
-[font-family] DECLARATION_PROPERTY - 230, 11
-[:] DECLARATION_SEPARATOR - 241, 1
-[ ] S - 242, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 243, 10
-[  ] S - 253, 2
-[}] RBRACE - 255, 1
-[
-] S - 256, 2
-[h1] SELECTOR_ELEMENT_NAME - 258, 2
-[ ] SELECTOR_COMBINATOR - 260, 1
-[em] SELECTOR_ELEMENT_NAME - 261, 2
-[ ] S - 263, 1
-[{] LBRACE - 264, 1
-[  ] S - 265, 2
-[color] DECLARATION_PROPERTY - 267, 5
-[:] DECLARATION_SEPARATOR - 272, 1
-[ ] S - 273, 1
-[blue] DECLARATION_VALUE_IDENT - 274, 4
-[  ] S - 278, 2
-[}] RBRACE - 280, 1
-[
-] S - 281, 2
-[div] SELECTOR_ELEMENT_NAME - 283, 3
-[ ] SELECTOR_COMBINATOR - 286, 1
-[p] SELECTOR_ELEMENT_NAME - 287, 1
-[ ] SELECTOR_COMBINATOR - 288, 1
-[*] SELECTOR_UNIVERSAL - 289, 1
-[[] SELECTOR_ATTRIBUTE_START - 290, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 291, 4
-[]] SELECTOR_ATTRIBUTE_END - 295, 1
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[  ] S - 298, 2
-[color] DECLARATION_PROPERTY - 300, 5
-[:] DECLARATION_SEPARATOR - 305, 1
-[ ] S - 306, 1
-[blue] DECLARATION_VALUE_IDENT - 307, 4
-[  ] S - 311, 2
-[}] RBRACE - 313, 1
-[
-] S - 314, 2
-[body] SELECTOR_ELEMENT_NAME - 316, 4
-[ ] S - 320, 1
-[>] SELECTOR_COMBINATOR - 321, 1
-[ ] S - 322, 1
-[P] SELECTOR_ELEMENT_NAME - 323, 1
-[ ] S - 324, 1
-[{] LBRACE - 325, 1
-[  ] S - 326, 2
-[line-height] DECLARATION_PROPERTY - 328, 11
-[:] DECLARATION_SEPARATOR - 339, 1
-[ ] S - 340, 1
-[1.3] DECLARATION_VALUE_NUMBER - 341, 3
-[  ] S - 344, 2
-[}] RBRACE - 346, 1
-[
-] S - 347, 2
-[div] SELECTOR_ELEMENT_NAME - 349, 3
-[ ] SELECTOR_COMBINATOR - 352, 1
-[ol] SELECTOR_ELEMENT_NAME - 353, 2
-[>] SELECTOR_COMBINATOR - 355, 1
-[li] SELECTOR_ELEMENT_NAME - 356, 2
-[ ] SELECTOR_COMBINATOR - 358, 1
-[p] SELECTOR_ELEMENT_NAME - 359, 1
-[ ] S - 360, 1
-[{] LBRACE - 361, 1
-[ ] S - 362, 1
-[}] RBRACE - 363, 1
-[
-] S - 364, 2
-[math] SELECTOR_ELEMENT_NAME - 366, 4
-[ ] S - 370, 1
-[+] SELECTOR_COMBINATOR - 371, 1
-[ ] S - 372, 1
-[p] SELECTOR_ELEMENT_NAME - 373, 1
-[ ] S - 374, 1
-[{] LBRACE - 375, 1
-[  ] S - 376, 2
-[text-indent] DECLARATION_PROPERTY - 378, 11
-[:] DECLARATION_SEPARATOR - 389, 1
-[ ] S - 390, 1
-[0] DECLARATION_VALUE_NUMBER - 391, 1
-[  ] S - 392, 2
-[}] RBRACE - 394, 1
-[
-] S - 395, 2
-[h1] SELECTOR_ELEMENT_NAME - 397, 2
-[.opener] SELECTOR_CLASS - 399, 7
-[ ] S - 406, 1
-[+] SELECTOR_COMBINATOR - 407, 1
-[ ] S - 408, 1
-[h2] SELECTOR_ELEMENT_NAME - 409, 2
-[ ] S - 411, 1
-[{] LBRACE - 412, 1
-[  ] S - 413, 2
-[margin-top] DECLARATION_PROPERTY - 415, 10
-[:] DECLARATION_SEPARATOR - 425, 1
-[ ] S - 426, 1
-[-5mm] DECLARATION_VALUE_DIMENSION - 427, 4
-[  ] S - 431, 2
-[}] RBRACE - 433, 1
-[
-] S - 434, 2
-[h1] SELECTOR_ELEMENT_NAME - 436, 2
-[[] SELECTOR_ATTRIBUTE_START - 438, 1
-[title] SELECTOR_ATTRIBUTE_NAME - 439, 5
-[]] SELECTOR_ATTRIBUTE_END - 444, 1
-[ ] S - 445, 1
-[{] LBRACE - 446, 1
-[  ] S - 447, 2
-[color] DECLARATION_PROPERTY - 449, 5
-[:] DECLARATION_SEPARATOR - 454, 1
-[ ] S - 455, 1
-[blue] DECLARATION_VALUE_IDENT - 456, 4
-[;] DECLARATION_DELIMITER - 460, 1
-[  ] S - 461, 2
-[}] RBRACE - 463, 1
-[
-] S - 464, 2
-[span] SELECTOR_ELEMENT_NAME - 466, 4
-[[] SELECTOR_ATTRIBUTE_START - 470, 1
-[class] SELECTOR_ATTRIBUTE_NAME - 471, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 476, 1
-[example] SELECTOR_ATTRIBUTE_VALUE - 477, 7
-[]] SELECTOR_ATTRIBUTE_END - 484, 1
-[ ] S - 485, 1
-[{] LBRACE - 486, 1
-[  ] S - 487, 2
-[color] DECLARATION_PROPERTY - 489, 5
-[:] DECLARATION_SEPARATOR - 494, 1
-[ ] S - 495, 1
-[blue] DECLARATION_VALUE_IDENT - 496, 4
-[;] DECLARATION_DELIMITER - 500, 1
-[  ] S - 501, 2
-[}] RBRACE - 503, 1
-[
-] S - 504, 2
-[span] SELECTOR_ELEMENT_NAME - 506, 4
-[[] SELECTOR_ATTRIBUTE_START - 510, 1
-[hello] SELECTOR_ATTRIBUTE_NAME - 511, 5
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 516, 1
-["Cleveland"] SELECTOR_ATTRIBUTE_VALUE - 517, 11
-[]] SELECTOR_ATTRIBUTE_END - 528, 1
-[[] SELECTOR_ATTRIBUTE_START - 529, 1
-[goodbye] SELECTOR_ATTRIBUTE_NAME - 530, 7
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 537, 1
-["Columbus"] SELECTOR_ATTRIBUTE_VALUE - 538, 10
-[]] SELECTOR_ATTRIBUTE_END - 548, 1
-[ ] S - 549, 1
-[{] LBRACE - 550, 1
-[  ] S - 551, 2
-[color] DECLARATION_PROPERTY - 553, 5
-[:] DECLARATION_SEPARATOR - 558, 1
-[ ] S - 559, 1
-[blue] DECLARATION_VALUE_IDENT - 560, 4
-[;] DECLARATION_DELIMITER - 564, 1
-[  ] S - 565, 2
-[}] RBRACE - 567, 1
-[
-] S - 568, 2
-[a] SELECTOR_ELEMENT_NAME - 570, 1
-[[] SELECTOR_ATTRIBUTE_START - 571, 1
-[rel] SELECTOR_ATTRIBUTE_NAME - 572, 3
-[~=] SELECTOR_ATTRIBUTE_OPERATOR - 575, 2
-["copyright"] SELECTOR_ATTRIBUTE_VALUE - 577, 11
-[]] SELECTOR_ATTRIBUTE_END - 588, 1
-[ ] S - 589, 1
-[{] LBRACE - 590, 1
-[  ] S - 591, 2
-[color] DECLARATION_PROPERTY - 593, 5
-[:] DECLARATION_SEPARATOR - 598, 1
-[ ] S - 599, 1
-[blue] DECLARATION_VALUE_IDENT - 600, 4
-[  ] S - 604, 2
-[}] RBRACE - 606, 1
-[
-] S - 607, 2
-[a] SELECTOR_ELEMENT_NAME - 609, 1
-[[] SELECTOR_ATTRIBUTE_START - 610, 1
-[href] SELECTOR_ATTRIBUTE_NAME - 611, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 615, 1
-["http://www.w3.org/"] SELECTOR_ATTRIBUTE_VALUE - 616, 20
-[]] SELECTOR_ATTRIBUTE_END - 636, 1
-[ ] S - 637, 1
-[{] LBRACE - 638, 1
-[  ] S - 639, 2
-[color] DECLARATION_PROPERTY - 641, 5
-[:] DECLARATION_SEPARATOR - 646, 1
-[ ] S - 647, 1
-[blue] DECLARATION_VALUE_IDENT - 648, 4
-[  ] S - 652, 2
-[}] RBRACE - 654, 1
-[
-] S - 655, 2
-[*] SELECTOR_UNIVERSAL - 657, 1
-[[] SELECTOR_ATTRIBUTE_START - 658, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 659, 4
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 663, 1
-[fr] SELECTOR_ATTRIBUTE_VALUE - 664, 2
-[]] SELECTOR_ATTRIBUTE_END - 666, 1
-[ ] S - 667, 1
-[{] LBRACE - 668, 1
-[  ] S - 669, 2
-[display] DECLARATION_PROPERTY - 671, 7
-[ ] S - 678, 1
-[:] DECLARATION_SEPARATOR - 679, 1
-[ ] S - 680, 1
-[none] DECLARATION_VALUE_IDENT - 681, 4
-[  ] S - 685, 2
-[}] RBRACE - 687, 1
-[
-] S - 688, 2
-[*] SELECTOR_UNIVERSAL - 690, 1
-[[] SELECTOR_ATTRIBUTE_START - 691, 1
-[lang] SELECTOR_ATTRIBUTE_NAME - 692, 4
-[|=] SELECTOR_ATTRIBUTE_OPERATOR - 696, 2
-["en"] SELECTOR_ATTRIBUTE_VALUE - 698, 4
-[]] SELECTOR_ATTRIBUTE_END - 702, 1
-[ ] S - 703, 1
-[{] LBRACE - 704, 1
-[  ] S - 705, 2
-[color] DECLARATION_PROPERTY - 707, 5
-[ ] S - 712, 1
-[:] DECLARATION_SEPARATOR - 713, 1
-[ ] S - 714, 1
-[red] DECLARATION_VALUE_IDENT - 715, 3
-[  ] S - 718, 2
-[}] RBRACE - 720, 1
-[
-] S - 721, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 723, 8
-[[] SELECTOR_ATTRIBUTE_START - 731, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 732, 9
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 741, 1
-[romeo] SELECTOR_ATTRIBUTE_VALUE - 742, 5
-[]] SELECTOR_ATTRIBUTE_END - 747, 1
-[
-] S - 748, 2
-[{] LBRACE - 750, 1
-[  ] S - 751, 2
-[voice-family] DECLARATION_PROPERTY - 753, 12
-[:] DECLARATION_SEPARATOR - 765, 1
-[ ] S - 766, 1
-["Lawrence Olivier"] DECLARATION_VALUE_STRING - 767, 18
-[,] DECLARATION_VALUE_OPERATOR - 785, 1
-[ ] DECLARATION_VALUE_S - 786, 1
-[charles] DECLARATION_VALUE_IDENT - 787, 7
-[,] DECLARATION_VALUE_OPERATOR - 794, 1
-[ ] DECLARATION_VALUE_S - 795, 1
-[male] DECLARATION_VALUE_IDENT - 796, 4
-[  ] S - 800, 2
-[}] RBRACE - 802, 1
-[
-] S - 803, 2
-[DIALOGUE] SELECTOR_ELEMENT_NAME - 805, 8
-[[] SELECTOR_ATTRIBUTE_START - 813, 1
-[ ] S - 814, 1
-[character] SELECTOR_ATTRIBUTE_NAME - 815, 9
-[ ] S - 824, 1
-[=] SELECTOR_ATTRIBUTE_OPERATOR - 825, 1
-[ ] S - 826, 1
-[juliet] SELECTOR_ATTRIBUTE_VALUE - 827, 6
-[ ] S - 833, 1
-[]] SELECTOR_ATTRIBUTE_END - 834, 1
-[
-] S - 835, 2
-[{] LBRACE - 837, 1
-[  ] S - 838, 2
-[voice-family] DECLARATION_PROPERTY - 840, 12
-[:] DECLARATION_SEPARATOR - 852, 1
-[ ] S - 853, 1
-["Vivien Leigh"] DECLARATION_VALUE_STRING - 854, 14
-[,] DECLARATION_VALUE_OPERATOR - 868, 1
-[ ] DECLARATION_VALUE_S - 869, 1
-[victoria] DECLARATION_VALUE_IDENT - 870, 8
-[,] DECLARATION_VALUE_OPERATOR - 878, 1
-[ ] DECLARATION_VALUE_S - 879, 1
-[female] DECLARATION_VALUE_IDENT - 880, 6
-[  ] S - 886, 2
-[}] RBRACE - 888, 1
-[
-] S - 889, 2
-[*] SELECTOR_UNIVERSAL - 891, 1
-[.pastoral] SELECTOR_CLASS - 892, 9
-[ ] S - 901, 1
-[{] LBRACE - 902, 1
-[  ] S - 903, 2
-[color] DECLARATION_PROPERTY - 905, 5
-[:] DECLARATION_SEPARATOR - 910, 1
-[ ] S - 911, 1
-[green] DECLARATION_VALUE_IDENT - 912, 5
-[  ] S - 917, 2
-[}] RBRACE - 919, 1
-[
-] S - 920, 2
-[.pastoral] SELECTOR_CLASS - 922, 9
-[ ] S - 931, 1
-[{] LBRACE - 932, 1
-[  ] S - 933, 2
-[color] DECLARATION_PROPERTY - 935, 5
-[:] DECLARATION_SEPARATOR - 940, 1
-[ ] S - 941, 1
-[green] DECLARATION_VALUE_IDENT - 942, 5
-[  ] S - 947, 2
-[}] RBRACE - 949, 1
-[
-] S - 950, 2
-[H1] SELECTOR_ELEMENT_NAME - 952, 2
-[.pastoral] SELECTOR_CLASS - 954, 9
-[ ] S - 963, 1
-[{] LBRACE - 964, 1
-[  ] S - 965, 2
-[color] DECLARATION_PROPERTY - 967, 5
-[:] DECLARATION_SEPARATOR - 972, 1
-[ ] S - 973, 1
-[green] DECLARATION_VALUE_IDENT - 974, 5
-[  ] S - 979, 2
-[}] RBRACE - 981, 1
-[
-] S - 982, 2
-[p] SELECTOR_ELEMENT_NAME - 984, 1
-[.pastoral] SELECTOR_CLASS - 985, 9
-[.marine] SELECTOR_CLASS - 994, 7
-[ ] S - 1001, 1
-[{] LBRACE - 1002, 1
-[  ] S - 1003, 2
-[color] DECLARATION_PROPERTY - 1005, 5
-[:] DECLARATION_SEPARATOR - 1010, 1
-[ ] S - 1011, 1
-[green] DECLARATION_VALUE_IDENT - 1012, 5
-[  ] S - 1017, 2
-[}] RBRACE - 1019, 1
-[
-] S - 1020, 2
-[h1] SELECTOR_ELEMENT_NAME - 1022, 2
-[#chapter1] SELECTOR_ID - 1024, 9
-[ ] S - 1033, 1
-[{] LBRACE - 1034, 1
-[  ] S - 1035, 2
-[text-align] DECLARATION_PROPERTY - 1037, 10
-[:] DECLARATION_SEPARATOR - 1047, 1
-[ ] S - 1048, 1
-[center] DECLARATION_VALUE_IDENT - 1049, 6
-[  ] S - 1055, 2
-[}] RBRACE - 1057, 1
-[
-] S - 1058, 2
-[div] SELECTOR_ELEMENT_NAME - 1060, 3
-[ ] S - 1063, 1
-[>] SELECTOR_COMBINATOR - 1064, 1
-[ ] S - 1065, 1
-[p] SELECTOR_ELEMENT_NAME - 1066, 1
-[:first-child] SELECTOR_PSEUDO - 1067, 12
-[ ] S - 1079, 1
-[{] LBRACE - 1080, 1
-[  ] S - 1081, 2
-[text-indent] DECLARATION_PROPERTY - 1083, 11
-[:] DECLARATION_SEPARATOR - 1094, 1
-[ ] S - 1095, 1
-[0] DECLARATION_VALUE_NUMBER - 1096, 1
-[  ] S - 1097, 2
-[}] RBRACE - 1099, 1
-[
-] S - 1100, 2
-[p] SELECTOR_ELEMENT_NAME - 1102, 1
-[:first-child] SELECTOR_PSEUDO - 1103, 12
-[ ] SELECTOR_COMBINATOR - 1115, 1
-[em] SELECTOR_ELEMENT_NAME - 1116, 2
-[ ] S - 1118, 1
-[{] LBRACE - 1119, 1
-[  ] S - 1120, 2
-[font-weight] DECLARATION_PROPERTY - 1122, 11
-[ ] S - 1133, 1
-[:] DECLARATION_SEPARATOR - 1134, 1
-[ ] S - 1135, 1
-[bold] DECLARATION_VALUE_IDENT - 1136, 4
-[  ] S - 1140, 2
-[}] RBRACE - 1142, 1
-[
-] S - 1143, 2
-[*] SELECTOR_UNIVERSAL - 1145, 1
-[ ] S - 1146, 1
-[>] SELECTOR_COMBINATOR - 1147, 1
-[ ] S - 1148, 1
-[a] SELECTOR_ELEMENT_NAME - 1149, 1
-[:first-child] SELECTOR_PSEUDO - 1150, 12
-[ ] S - 1162, 1
-[{] LBRACE - 1163, 1
-[  ] S - 1164, 2
-[font-weight] DECLARATION_PROPERTY - 1166, 11
-[ ] S - 1177, 1
-[:] DECLARATION_SEPARATOR - 1178, 1
-[ ] S - 1179, 1
-[bold] DECLARATION_VALUE_IDENT - 1180, 4
-[  ] S - 1184, 2
-[}] RBRACE - 1186, 1
-[
-] S - 1187, 2
-[a] SELECTOR_ELEMENT_NAME - 1189, 1
-[:first-child] SELECTOR_PSEUDO - 1190, 12
-[ ] S - 1202, 1
-[{] LBRACE - 1203, 1
-[  ] S - 1204, 2
-[font-weight] DECLARATION_PROPERTY - 1206, 11
-[ ] S - 1217, 1
-[:] DECLARATION_SEPARATOR - 1218, 1
-[ ] S - 1219, 1
-[bold] DECLARATION_VALUE_IDENT - 1220, 4
-[  ] S - 1224, 2
-[}] RBRACE - 1226, 1
-[
-] S - 1227, 2
-[a] SELECTOR_ELEMENT_NAME - 1229, 1
-[.external] SELECTOR_CLASS - 1230, 9
-[:visited] SELECTOR_PSEUDO - 1239, 8
-[ ] S - 1247, 1
-[{] LBRACE - 1248, 1
-[  ] S - 1249, 2
-[color] DECLARATION_PROPERTY - 1251, 5
-[:] DECLARATION_SEPARATOR - 1256, 1
-[ ] S - 1257, 1
-[blue] DECLARATION_VALUE_IDENT - 1258, 4
-[  ] S - 1262, 2
-[}] RBRACE - 1264, 1
-[
-] S - 1265, 2
-[a] SELECTOR_ELEMENT_NAME - 1267, 1
-[:focus] SELECTOR_PSEUDO - 1268, 6
-[:hover] SELECTOR_PSEUDO - 1274, 6
-[ ] S - 1280, 1
-[{] LBRACE - 1281, 1
-[  ] S - 1282, 2
-[background] DECLARATION_PROPERTY - 1284, 10
-[:] DECLARATION_SEPARATOR - 1294, 1
-[ ] S - 1295, 1
-[white] DECLARATION_VALUE_IDENT - 1296, 5
-[  ] S - 1301, 2
-[}] RBRACE - 1303, 1
-[
-] S - 1304, 2
-[html] SELECTOR_ELEMENT_NAME - 1306, 4
-[:lang(fr)] SELECTOR_PSEUDO - 1310, 9
-[ ] S - 1319, 1
-[{] LBRACE - 1320, 1
-[  ] S - 1321, 2
-[quotes] DECLARATION_PROPERTY - 1323, 6
-[:] DECLARATION_SEPARATOR - 1329, 1
-[ ] S - 1330, 1
-['<<'] DECLARATION_VALUE_STRING - 1331, 4
-[ ] DECLARATION_VALUE_S - 1335, 1
-['>>'] DECLARATION_VALUE_STRING - 1336, 4
-[  ] S - 1340, 2
-[}] RBRACE - 1342, 1
-[
-] S - 1343, 2
-[html] SELECTOR_ELEMENT_NAME - 1345, 4
-[:lang(de)] SELECTOR_PSEUDO - 1349, 9
-[ ] S - 1358, 1
-[{] LBRACE - 1359, 1
-[  ] S - 1360, 2
-[quotes] DECLARATION_PROPERTY - 1362, 6
-[:] DECLARATION_SEPARATOR - 1368, 1
-[ ] S - 1369, 1
-['>>'] DECLARATION_VALUE_STRING - 1370, 4
-[ ] DECLARATION_VALUE_S - 1374, 1
-['<<'] DECLARATION_VALUE_STRING - 1375, 4
-[ ] DECLARATION_VALUE_S - 1379, 1
-['\2039'] DECLARATION_VALUE_STRING - 1380, 7
-[ ] DECLARATION_VALUE_S - 1387, 1
-['\203A'] DECLARATION_VALUE_STRING - 1388, 7
-[  ] S - 1395, 2
-[}] RBRACE - 1397, 1
-[
-] S - 1398, 2
-[:lang(fr)] SELECTOR_PSEUDO - 1400, 9
-[ ] S - 1409, 1
-[>] SELECTOR_COMBINATOR - 1410, 1
-[ ] S - 1411, 1
-[Q] SELECTOR_ELEMENT_NAME - 1412, 1
-[ ] S - 1413, 1
-[{] LBRACE - 1414, 1
-[  ] S - 1415, 2
-[quotes] DECLARATION_PROPERTY - 1417, 6
-[:] DECLARATION_SEPARATOR - 1423, 1
-[ ] S - 1424, 1
-['<<'] DECLARATION_VALUE_STRING - 1425, 4
-[ ] DECLARATION_VALUE_S - 1429, 1
-['>>'] DECLARATION_VALUE_STRING - 1430, 4
-[  ] S - 1434, 2
-[}] RBRACE - 1436, 1
-[
-] S - 1437, 2
-[:lang(de)] SELECTOR_PSEUDO - 1439, 9
-[ ] S - 1448, 1
-[>] SELECTOR_COMBINATOR - 1449, 1
-[ ] S - 1450, 1
-[Q] SELECTOR_ELEMENT_NAME - 1451, 1
-[ ] S - 1452, 1
-[{] LBRACE - 1453, 1
-[  ] S - 1454, 2
-[quotes] DECLARATION_PROPERTY - 1456, 6
-[:] DECLARATION_SEPARATOR - 1462, 1
-[ ] S - 1463, 1
-['>>'] DECLARATION_VALUE_STRING - 1464, 4
-[ ] DECLARATION_VALUE_S - 1468, 1
-['<<'] DECLARATION_VALUE_STRING - 1469, 4
-[ ] DECLARATION_VALUE_S - 1473, 1
-['\2039'] DECLARATION_VALUE_STRING - 1474, 7
-[ ] DECLARATION_VALUE_S - 1481, 1
-['\203A'] DECLARATION_VALUE_STRING - 1482, 7
-[  ] S - 1489, 2
-[}] RBRACE - 1491, 1
-[
-] S - 1492, 2
-[p] SELECTOR_ELEMENT_NAME - 1494, 1
-[:first-letter] SELECTOR_PSEUDO - 1495, 13
-[ ] S - 1508, 1
-[{] LBRACE - 1509, 1
-[  ] S - 1510, 2
-[font-size] DECLARATION_PROPERTY - 1512, 9
-[:] DECLARATION_SEPARATOR - 1521, 1
-[ ] S - 1522, 1
-[3em] DECLARATION_VALUE_DIMENSION - 1523, 3
-[;] DECLARATION_DELIMITER - 1526, 1
-[ ] S - 1527, 1
-[font-weight] DECLARATION_PROPERTY - 1528, 11
-[:] DECLARATION_SEPARATOR - 1539, 1
-[ ] S - 1540, 1
-[normal] DECLARATION_VALUE_IDENT - 1541, 6
-[  ] S - 1547, 2
-[}] RBRACE - 1549, 1
-[
-] S - 1550, 2
-[p] SELECTOR_ELEMENT_NAME - 1552, 1
-[.special] SELECTOR_CLASS - 1553, 8
-[:before] SELECTOR_PSEUDO - 1561, 7
-[ ] S - 1568, 1
-[{] LBRACE - 1569, 1
-[ ] S - 1570, 1
-[content] DECLARATION_PROPERTY - 1571, 7
-[:] DECLARATION_SEPARATOR - 1578, 1
-[ ] S - 1579, 1
-["Special! "] DECLARATION_VALUE_STRING - 1580, 11
-[ ] S - 1591, 1
-[}] RBRACE - 1592, 1
-[
-] S - 1593, 2
-[p] SELECTOR_ELEMENT_NAME - 1595, 1
-[.special] SELECTOR_CLASS - 1596, 8
-[:first-letter] SELECTOR_PSEUDO - 1604, 13
-[ ] S - 1617, 1
-[{] LBRACE - 1618, 1
-[ ] S - 1619, 1
-[color] DECLARATION_PROPERTY - 1620, 5
-[:] DECLARATION_SEPARATOR - 1625, 1
-[ ] S - 1626, 1
-[#ffd800] DECLARATION_VALUE_HASH - 1627, 7
-[ ] S - 1634, 1
-[}] RBRACE - 1635, 1
-[
-] S - 1636, 2
-[BODY] SELECTOR_ELEMENT_NAME - 1638, 4
-[ ] S - 1642, 1
-[{] LBRACE - 1643, 1
-[ ] S - 1644, 1
-[font-family] DECLARATION_PROPERTY - 1645, 11
-[:] DECLARATION_SEPARATOR - 1656, 1
-[ ] S - 1657, 1
-[Baskerville] DECLARATION_VALUE_IDENT - 1658, 11
-[,] DECLARATION_VALUE_OPERATOR - 1669, 1
-[ ] DECLARATION_VALUE_S - 1670, 1
-["Heisi Mincho W3"] DECLARATION_VALUE_STRING - 1671, 17
-[,] DECLARATION_VALUE_OPERATOR - 1688, 1
-[ ] DECLARATION_VALUE_S - 1689, 1
-[Symbol] DECLARATION_VALUE_IDENT - 1690, 6
-[,] DECLARATION_VALUE_OPERATOR - 1696, 1
-[ ] DECLARATION_VALUE_S - 1697, 1
-[serif] DECLARATION_VALUE_IDENT - 1698, 5
-[ ] S - 1703, 1
-[}] RBRACE - 1704, 1
-[
-] S - 1705, 2
-[*] SELECTOR_UNIVERSAL - 1707, 1
-[:lang(ja-jp)] SELECTOR_PSEUDO - 1708, 12
-[ ] S - 1720, 1
-[{] LBRACE - 1721, 1
-[ ] S - 1722, 1
-[font] DECLARATION_PROPERTY - 1723, 4
-[:] DECLARATION_SEPARATOR - 1727, 1
-[ ] S - 1728, 1
-[900] DECLARATION_VALUE_NUMBER - 1729, 3
-[ ] DECLARATION_VALUE_S - 1732, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1733, 4
-[/] DECLARATION_VALUE_OPERATOR - 1737, 1
-[16pt] DECLARATION_VALUE_DIMENSION - 1738, 4
-[ ] DECLARATION_VALUE_S - 1742, 1
-["Heisei Mincho W9"] DECLARATION_VALUE_STRING - 1743, 18
-[,] DECLARATION_VALUE_OPERATOR - 1761, 1
-[ ] DECLARATION_VALUE_S - 1762, 1
-[serif] DECLARATION_VALUE_IDENT - 1763, 5
-[ ] S - 1768, 1
-[}] RBRACE - 1769, 1
-[
-] S - 1770, 2
-[*] SELECTOR_UNIVERSAL - 1772, 1
-[:lang(zh-tw)] SELECTOR_PSEUDO - 1773, 12
-[ ] S - 1785, 1
-[{] LBRACE - 1786, 1
-[ ] S - 1787, 1
-[font] DECLARATION_PROPERTY - 1788, 4
-[:] DECLARATION_SEPARATOR - 1792, 1
-[ ] S - 1793, 1
-[800] DECLARATION_VALUE_NUMBER - 1794, 3
-[ ] DECLARATION_VALUE_S - 1797, 1
-[14pt] DECLARATION_VALUE_DIMENSION - 1798, 4
-[/] DECLARATION_VALUE_OPERATOR - 1802, 1
-[16.5pt] DECLARATION_VALUE_DIMENSION - 1803, 6
-[ ] DECLARATION_VALUE_S - 1809, 1
-["Li Sung"] DECLARATION_VALUE_STRING - 1810, 9
-[,] DECLARATION_VALUE_OPERATOR - 1819, 1
-[ ] DECLARATION_VALUE_S - 1820, 1
-[serif] DECLARATION_VALUE_IDENT - 1821, 5
-[ ] S - 1826, 1
-[}] RBRACE - 1827, 1
-[
-] S - 1828, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css
deleted file mode 100644
index 82217c00b..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample06.css
+++ /dev/null
@@ -1,101 +0,0 @@
-[declaration] SELECTOR_ELEMENT_NAME - 0, 11
-[ ] S - 11, 1
-[{] LBRACE - 12, 1
-[
-	] S - 13, 3
-[dimension] DECLARATION_PROPERTY - 16, 9
-[ ] S - 25, 1
-[:] DECLARATION_SEPARATOR - 26, 1
-[ ] S - 27, 1
-[100ex] DECLARATION_VALUE_DIMENSION - 28, 5
-[;] DECLARATION_DELIMITER - 33, 1
-[
-	] S - 34, 3
-[function] DECLARATION_PROPERTY - 37, 8
-[ ] S - 45, 1
-[:] DECLARATION_SEPARATOR - 46, 1
-[ ] S - 47, 1
-[rect(] DECLARATION_VALUE_FUNCTION - 48, 5
-[100] DECLARATION_VALUE_NUMBER - 53, 3
-[,] DECLARATION_VALUE_OPERATOR - 56, 1
-[ ] DECLARATION_VALUE_S - 57, 1
-[200] DECLARATION_VALUE_NUMBER - 58, 3
-[,] DECLARATION_VALUE_OPERATOR - 61, 1
-[ ] DECLARATION_VALUE_S - 62, 1
-[300] DECLARATION_VALUE_NUMBER - 63, 3
-[,] DECLARATION_VALUE_OPERATOR - 66, 1
-[ ] DECLARATION_VALUE_S - 67, 1
-[400] DECLARATION_VALUE_NUMBER - 68, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 71, 1
-[,] DECLARATION_VALUE_OPERATOR - 72, 1
-[ ] DECLARATION_VALUE_S - 73, 1
-[format(] DECLARATION_VALUE_FUNCTION - 74, 7
-["intellifont"] DECLARATION_VALUE_STRING - 81, 13
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 94, 1
-[,] DECLARATION_VALUE_OPERATOR - 95, 1
-[ ] DECLARATION_VALUE_S - 96, 1
-[local(] DECLARATION_VALUE_FUNCTION - 97, 6
-["Excelsior Cyrilllic Upright"] DECLARATION_VALUE_STRING - 103, 29
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 132, 1
-[;] DECLARATION_DELIMITER - 133, 1
-[
-	] S - 134, 3
-[hash] DECLARATION_PROPERTY - 137, 4
-[ ] S - 141, 1
-[:] DECLARATION_SEPARATOR - 142, 1
-[ ] S - 143, 1
-[#aabbcc] DECLARATION_VALUE_HASH - 144, 7
-[;] DECLARATION_DELIMITER - 151, 1
-[
-	] S - 152, 3
-[ident] DECLARATION_PROPERTY - 155, 5
-[ ] S - 160, 1
-[:] DECLARATION_SEPARATOR - 161, 1
-[ ] S - 162, 1
-[any] DECLARATION_VALUE_IDENT - 163, 3
-[;] DECLARATION_DELIMITER - 166, 1
-[
-	] S - 167, 3
-[number] DECLARATION_PROPERTY - 170, 6
-[ ] S - 176, 1
-[:] DECLARATION_SEPARATOR - 177, 1
-[ ] S - 178, 1
-[99999] DECLARATION_VALUE_NUMBER - 179, 5
-[;] DECLARATION_DELIMITER - 184, 1
-[
-	] S - 185, 3
-[percentage] DECLARATION_PROPERTY - 188, 10
-[ ] S - 198, 1
-[:] DECLARATION_SEPARATOR - 199, 1
-[ ] S - 200, 1
-[100%] DECLARATION_VALUE_PERCENTAGE - 201, 4
-[;] DECLARATION_DELIMITER - 205, 1
-[
-	] S - 206, 3
-[string] DECLARATION_PROPERTY - 209, 6
-[ ] S - 215, 1
-[:] DECLARATION_SEPARATOR - 216, 1
-[ ] S - 217, 1
-["string"] DECLARATION_VALUE_STRING - 218, 8
-[;] DECLARATION_DELIMITER - 226, 1
-[
-	] S - 227, 3
-[unicode-range] DECLARATION_PROPERTY - 230, 13
-[ ] S - 243, 1
-[:] DECLARATION_SEPARATOR - 244, 1
-[ ] S - 245, 1
-[U+??] DECLARATION_VALUE_UNICODE_RANGE - 246, 4
-[,] DECLARATION_VALUE_OPERATOR - 250, 1
-[ ] DECLARATION_VALUE_S - 251, 1
-[U+100-220] DECLARATION_VALUE_UNICODE_RANGE - 252, 9
-[,] DECLARATION_VALUE_OPERATOR - 261, 1
-[ ] DECLARATION_VALUE_S - 262, 1
-[U+4??] DECLARATION_VALUE_UNICODE_RANGE - 263, 5
-[;] DECLARATION_DELIMITER - 268, 1
-[
-] S - 269, 2
-[}] RBRACE - 271, 1
-[
-] S - 272, 2
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css
deleted file mode 100644
index ffed5b291..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/results/CSSTextParserTest-sample07.css
+++ /dev/null
@@ -1,583 +0,0 @@
-[@charset] CHARSET - 0, 8
-[ ] S - 8, 1
-["ISO-8859-1"] STRING - 9, 12
-[;] DELIMITER - 21, 1
-[
-
-] S - 22, 4
-[@import] IMPORT - 26, 7
-[ ] S - 33, 1
-[url("../sample2.css")] URI - 34, 21
-[ ] S - 55, 1
-[projection] MEDIUM - 56, 10
-[,] MEDIA_SEPARATOR - 66, 1
-[ ] S - 67, 1
-[tv] MEDIUM - 68, 2
-[;] DELIMITER - 70, 1
-[
-
-] S - 71, 4
-[BODY] SELECTOR_ELEMENT_NAME - 75, 4
-[ ] S - 79, 1
-[{] LBRACE - 80, 1
-[
-    ] S - 81, 6
-[color] DECLARATION_PROPERTY - 87, 5
-[ ] S - 92, 1
-[:] DECLARATION_SEPARATOR - 93, 1
-[ ] S - 94, 1
-[black] DECLARATION_VALUE_IDENT - 95, 5
-[;] DECLARATION_DELIMITER - 100, 1
-[
-    ] S - 101, 6
-[text-align] DECLARATION_PROPERTY - 107, 10
-[ ] S - 117, 1
-[:] DECLARATION_SEPARATOR - 118, 1
-[ ] S - 119, 1
-[center] DECLARATION_VALUE_IDENT - 120, 6
-[;] DECLARATION_DELIMITER - 126, 1
-[
-    ] S - 127, 6
-[background-color] DECLARATION_PROPERTY - 133, 16
-[ ] S - 149, 1
-[:] DECLARATION_SEPARATOR - 150, 1
-[ ] S - 151, 1
-[rgb(] DECLARATION_VALUE_FUNCTION - 152, 4
-[ ] DECLARATION_VALUE_S - 156, 1
-[181] DECLARATION_VALUE_NUMBER - 157, 3
-[,] DECLARATION_VALUE_OPERATOR - 160, 1
-[ ] DECLARATION_VALUE_S - 161, 1
-[253] DECLARATION_VALUE_NUMBER - 162, 3
-[,] DECLARATION_VALUE_OPERATOR - 165, 1
-[ ] DECLARATION_VALUE_S - 166, 1
-[211] DECLARATION_VALUE_NUMBER - 167, 3
-[ ] DECLARATION_VALUE_S - 170, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 171, 1
-[
-] S - 172, 2
-[}] RBRACE - 174, 1
-[
-
-] S - 175, 4
-[UL] SELECTOR_ELEMENT_NAME - 179, 2
-[ ] S - 181, 1
-[{] LBRACE - 182, 1
-[
-    ] S - 183, 6
-[color] DECLARATION_PROPERTY - 189, 5
-[ ] S - 194, 1
-[:] DECLARATION_SEPARATOR - 195, 1
-[ ] S - 196, 1
-[black] DECLARATION_VALUE_IDENT - 197, 5
-[;] DECLARATION_DELIMITER - 202, 1
-[
-    ] S - 203, 6
-[list-style-image] DECLARATION_PROPERTY - 209, 16
-[ ] S - 225, 1
-[:] DECLARATION_SEPARATOR - 226, 1
-[ ] S - 227, 1
-[url("images/l_a01.gif")] DECLARATION_VALUE_URI - 228, 23
-[;] DECLARATION_DELIMITER - 251, 1
-[
-    ] S - 252, 6
-[list-style-position] DECLARATION_PROPERTY - 258, 19
-[ ] S - 277, 1
-[:] DECLARATION_SEPARATOR - 278, 1
-[ ] S - 279, 1
-[outside] DECLARATION_VALUE_IDENT - 280, 7
-[
-] S - 287, 2
-[}] RBRACE - 289, 1
-[
-
-] S - 290, 4
-[H1] SELECTOR_ELEMENT_NAME - 294, 2
-[ ] S - 296, 1
-[{] LBRACE - 297, 1
-[
-    ] S - 298, 6
-[color] DECLARATION_PROPERTY - 304, 5
-[ ] S - 309, 1
-[:] DECLARATION_SEPARATOR - 310, 1
-[ ] S - 311, 1
-[white] DECLARATION_VALUE_IDENT - 312, 5
-[;] DECLARATION_DELIMITER - 317, 1
-[
-    ] S - 318, 6
-[text-align] DECLARATION_PROPERTY - 324, 10
-[ ] S - 334, 1
-[:] DECLARATION_SEPARATOR - 335, 1
-[ ] S - 336, 1
-[center] DECLARATION_VALUE_IDENT - 337, 6
-[;] DECLARATION_DELIMITER - 343, 1
-[
-    ] S - 344, 6
-[border-left-color] DECLARATION_PROPERTY - 350, 17
-[ ] S - 367, 1
-[:] DECLARATION_SEPARATOR - 368, 1
-[ ] S - 369, 1
-[#996666] DECLARATION_VALUE_HASH - 370, 7
-[;] DECLARATION_DELIMITER - 377, 1
-[
-    ] S - 378, 6
-[padding-top] DECLARATION_PROPERTY - 384, 11
-[ ] S - 395, 1
-[:] DECLARATION_SEPARATOR - 396, 1
-[ ] S - 397, 1
-[0px] DECLARATION_VALUE_DIMENSION - 398, 3
-[;] DECLARATION_DELIMITER - 401, 1
-[
-    ] S - 402, 6
-[padding-right] DECLARATION_PROPERTY - 408, 13
-[ ] S - 421, 1
-[:] DECLARATION_SEPARATOR - 422, 1
-[ ] S - 423, 1
-[1cm] DECLARATION_VALUE_DIMENSION - 424, 3
-[;] DECLARATION_DELIMITER - 427, 1
-[
-    ] S - 428, 6
-[padding-bottom] DECLARATION_PROPERTY - 434, 14
-[ ] S - 448, 1
-[:] DECLARATION_SEPARATOR - 449, 1
-[ ] S - 450, 1
-[2] DECLARATION_VALUE_NUMBER - 451, 1
-[;] DECLARATION_DELIMITER - 452, 1
-[
-    ] S - 453, 6
-[padding-left] DECLARATION_PROPERTY - 459, 12
-[ ] S - 471, 1
-[:] DECLARATION_SEPARATOR - 472, 1
-[ ] S - 473, 1
-[3em] DECLARATION_VALUE_DIMENSION - 474, 3
-[;] DECLARATION_DELIMITER - 477, 1
-[
-    ] S - 478, 6
-[border-style] DECLARATION_PROPERTY - 484, 12
-[ ] S - 496, 1
-[:] DECLARATION_SEPARATOR - 497, 1
-[ ] S - 498, 1
-[solid] DECLARATION_VALUE_IDENT - 499, 5
-[;] DECLARATION_DELIMITER - 504, 1
-[
-    ] S - 505, 6
-[border-top-width] DECLARATION_PROPERTY - 511, 16
-[ ] S - 527, 1
-[:] DECLARATION_SEPARATOR - 528, 1
-[ ] S - 529, 1
-[4.5ex] DECLARATION_VALUE_DIMENSION - 530, 5
-[;] DECLARATION_DELIMITER - 535, 1
-[
-    ] S - 536, 6
-[border-right-width] DECLARATION_PROPERTY - 542, 18
-[ ] S - 560, 1
-[:] DECLARATION_SEPARATOR - 561, 1
-[ ] S - 562, 1
-[5in] DECLARATION_VALUE_DIMENSION - 563, 3
-[;] DECLARATION_DELIMITER - 566, 1
-[
-    ] S - 567, 6
-[border-bottom-width] DECLARATION_PROPERTY - 573, 19
-[ ] S - 592, 1
-[:] DECLARATION_SEPARATOR - 593, 1
-[ ] S - 594, 1
-[6.02mm] DECLARATION_VALUE_DIMENSION - 595, 6
-[;] DECLARATION_DELIMITER - 601, 1
-[
-    ] S - 602, 6
-[border-left-width] DECLARATION_PROPERTY - 608, 17
-[ ] S - 625, 1
-[:] DECLARATION_SEPARATOR - 626, 1
-[ ] S - 627, 1
-[7] DECLARATION_VALUE_NUMBER - 628, 1
-[
-] S - 629, 2
-[}] RBRACE - 631, 1
-[
-
-] S - 632, 4
-[H1] SELECTOR_ELEMENT_NAME - 636, 2
-[:before] SELECTOR_PSEUDO - 638, 7
-[ ] S - 645, 1
-[{] LBRACE - 646, 1
-[
-    ] S - 647, 6
-[content] DECLARATION_PROPERTY - 653, 7
-[ ] S - 660, 1
-[:] DECLARATION_SEPARATOR - 661, 1
-[ ] S - 662, 1
-["Chapter "] DECLARATION_VALUE_STRING - 663, 10
-[ ] DECLARATION_VALUE_S - 673, 1
-[counter(] DECLARATION_VALUE_FUNCTION - 674, 8
-[ ] DECLARATION_VALUE_S - 682, 1
-[chapter] DECLARATION_VALUE_IDENT - 683, 7
-[ ] DECLARATION_VALUE_S - 690, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 691, 1
-[ ] DECLARATION_VALUE_S - 692, 1
-[". "] DECLARATION_VALUE_STRING - 693, 4
-[;] DECLARATION_DELIMITER - 697, 1
-[
-    ] S - 698, 6
-[counter-increment] DECLARATION_PROPERTY - 704, 17
-[ ] S - 721, 1
-[:] DECLARATION_SEPARATOR - 722, 1
-[ ] S - 723, 1
-[chapter] DECLARATION_VALUE_IDENT - 724, 7
-[;] DECLARATION_DELIMITER - 731, 1
-[
-    ] S - 732, 6
-[counter-reset] DECLARATION_PROPERTY - 738, 13
-[ ] S - 751, 1
-[:] DECLARATION_SEPARATOR - 752, 1
-[ ] S - 753, 1
-[section] DECLARATION_VALUE_IDENT - 754, 7
-[
-] S - 761, 2
-[}] RBRACE - 763, 1
-[
-
-] S - 764, 4
-[IMG] SELECTOR_ELEMENT_NAME - 768, 3
-[:before] SELECTOR_PSEUDO - 771, 7
-[ ] S - 778, 1
-[{] LBRACE - 779, 1
-[content] DECLARATION_PROPERTY - 780, 7
-[ ] S - 787, 1
-[:] DECLARATION_SEPARATOR - 788, 1
-[ ] S - 789, 1
-[attr(] DECLARATION_VALUE_FUNCTION - 790, 5
-[alt] DECLARATION_VALUE_IDENT - 795, 3
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 798, 1
-[}] RBRACE - 799, 1
-[
-
-] S - 800, 4
-[DIV] SELECTOR_ELEMENT_NAME - 804, 3
-[.sample] SELECTOR_CLASS - 807, 7
-[ ] S - 814, 1
-[{] LBRACE - 815, 1
-[
-    ] S - 816, 6
-[font-family] DECLARATION_PROPERTY - 822, 11
-[ ] S - 833, 1
-[:] DECLARATION_SEPARATOR - 834, 1
-[ ] S - 835, 1
-["Robson Celtic"] DECLARATION_VALUE_STRING - 836, 15
-[,] DECLARATION_VALUE_OPERATOR - 851, 1
-[ ] DECLARATION_VALUE_S - 852, 1
-[sans-serif] DECLARATION_VALUE_IDENT - 853, 10
-[;] DECLARATION_DELIMITER - 863, 1
-[
-    ] S - 864, 6
-[position] DECLARATION_PROPERTY - 870, 8
-[ ] S - 878, 1
-[:] DECLARATION_SEPARATOR - 879, 1
-[ ] S - 880, 1
-[absolute] DECLARATION_VALUE_IDENT - 881, 8
-[;] DECLARATION_DELIMITER - 889, 1
-[
-    ] S - 890, 6
-[left] DECLARATION_PROPERTY - 896, 4
-[ ] S - 900, 1
-[:] DECLARATION_SEPARATOR - 901, 1
-[ ] S - 902, 1
-[833.5pc] DECLARATION_VALUE_DIMENSION - 903, 7
-[;] DECLARATION_DELIMITER - 910, 1
-[
-    ] S - 911, 6
-[top] DECLARATION_PROPERTY - 917, 3
-[ ] S - 920, 1
-[:] DECLARATION_SEPARATOR - 921, 1
-[ ] S - 922, 1
-[90%] DECLARATION_VALUE_PERCENTAGE - 923, 3
-[;] DECLARATION_DELIMITER - 926, 1
-[
-    ] S - 927, 6
-[width] DECLARATION_PROPERTY - 933, 5
-[ ] S - 938, 1
-[:] DECLARATION_SEPARATOR - 939, 1
-[ ] S - 940, 1
-[100pt] DECLARATION_VALUE_DIMENSION - 941, 5
-[;] DECLARATION_DELIMITER - 946, 1
-[
-    ] S - 947, 6
-[height] DECLARATION_PROPERTY - 953, 6
-[ ] S - 959, 1
-[:] DECLARATION_SEPARATOR - 960, 1
-[ ] S - 961, 1
-[110.777px] DECLARATION_VALUE_DIMENSION - 962, 9
-[;] DECLARATION_DELIMITER - 971, 1
-[
-    ] S - 972, 6
-[clip] DECLARATION_PROPERTY - 978, 4
-[ ] S - 982, 1
-[:] DECLARATION_SEPARATOR - 983, 1
-[ ] S - 984, 1
-[rect(] DECLARATION_VALUE_FUNCTION - 985, 5
-[ ] DECLARATION_VALUE_S - 990, 1
-[-5px] DECLARATION_VALUE_DIMENSION - 991, 4
-[,] DECLARATION_VALUE_OPERATOR - 995, 1
-[ ] DECLARATION_VALUE_S - 996, 1
-[80px] DECLARATION_VALUE_DIMENSION - 997, 4
-[,] DECLARATION_VALUE_OPERATOR - 1001, 1
-[ ] DECLARATION_VALUE_S - 1002, 1
-[130px] DECLARATION_VALUE_DIMENSION - 1003, 5
-[,] DECLARATION_VALUE_OPERATOR - 1008, 1
-[ ] DECLARATION_VALUE_S - 1009, 1
-[0px] DECLARATION_VALUE_DIMENSION - 1010, 3
-[ ] DECLARATION_VALUE_S - 1013, 1
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1014, 1
-[
-] S - 1015, 2
-[}] RBRACE - 1017, 1
-[
-
-] S - 1018, 4
-[@font-face] FONT_FACE - 1022, 10
-[ ] S - 1032, 1
-[{] LBRACE - 1033, 1
-[
-    ] S - 1034, 6
-[font-family] DECLARATION_PROPERTY - 1040, 11
-[ ] S - 1051, 1
-[:] DECLARATION_SEPARATOR - 1052, 1
-[ ] S - 1053, 1
-["Swiss 721"] DECLARATION_VALUE_STRING - 1054, 11
-[;] DECLARATION_DELIMITER - 1065, 1
-[
-    ] S - 1066, 6
-[src] DECLARATION_PROPERTY - 1072, 3
-[ ] S - 1075, 1
-[:] DECLARATION_SEPARATOR - 1076, 1
-[ ] S - 1077, 1
-[url("swiss721t.pfr")] DECLARATION_VALUE_URI - 1078, 20
-[ ] DECLARATION_VALUE_S - 1098, 1
-[format(] DECLARATION_VALUE_FUNCTION - 1099, 7
-["intellifont"] DECLARATION_VALUE_STRING - 1106, 13
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1119, 1
-[,] DECLARATION_VALUE_OPERATOR - 1120, 1
-[ ] DECLARATION_VALUE_S - 1121, 1
-[local(] DECLARATION_VALUE_FUNCTION - 1122, 6
-["Excelsior Cyrilllic Upright"] DECLARATION_VALUE_STRING - 1128, 29
-[)] DECLARATION_VALUE_PARENTHESIS_CLOSE - 1157, 1
-[;] DECLARATION_DELIMITER - 1158, 1
-[
-    ] S - 1159, 6
-[unicode-range] DECLARATION_PROPERTY - 1165, 13
-[ ] S - 1178, 1
-[:] DECLARATION_SEPARATOR - 1179, 1
-[ ] S - 1180, 1
-[U+??] DECLARATION_VALUE_UNICODE_RANGE - 1181, 4
-[,] DECLARATION_VALUE_OPERATOR - 1185, 1
-[ ] DECLARATION_VALUE_S - 1186, 1
-[U+100-220] DECLARATION_VALUE_UNICODE_RANGE - 1187, 9
-[,] DECLARATION_VALUE_OPERATOR - 1196, 1
-[ ] DECLARATION_VALUE_S - 1197, 1
-[U+4??] DECLARATION_VALUE_UNICODE_RANGE - 1198, 5
-[;] DECLARATION_DELIMITER - 1203, 1
-[
-    ] S - 1204, 6
-[font-weight] DECLARATION_PROPERTY - 1210, 11
-[ ] S - 1221, 1
-[:] DECLARATION_SEPARATOR - 1222, 1
-[ ] S - 1223, 1
-[100] DECLARATION_VALUE_NUMBER - 1224, 3
-[,] DECLARATION_VALUE_OPERATOR - 1227, 1
-[ ] DECLARATION_VALUE_S - 1228, 1
-[200] DECLARATION_VALUE_NUMBER - 1229, 3
-[,] DECLARATION_VALUE_OPERATOR - 1232, 1
-[ ] DECLARATION_VALUE_S - 1233, 1
-[300] DECLARATION_VALUE_NUMBER - 1234, 3
-[,] DECLARATION_VALUE_OPERATOR - 1237, 1
-[ ] DECLARATION_VALUE_S - 1238, 1
-[400] DECLARATION_VALUE_NUMBER - 1239, 3
-[,] DECLARATION_VALUE_OPERATOR - 1242, 1
-[ ] DECLARATION_VALUE_S - 1243, 1
-[500] DECLARATION_VALUE_NUMBER - 1244, 3
-[
-] S - 1247, 2
-[}] RBRACE - 1249, 1
-[
-
-] S - 1250, 4
-[@page] PAGE - 1254, 5
-[ ] S - 1259, 1
-[:left] CSS_PAGE_SELECTOR - 1260, 5
-[ ] S - 1265, 1
-[{] LBRACE - 1266, 1
-[margin-left] DECLARATION_PROPERTY - 1267, 11
-[ ] S - 1278, 1
-[:] DECLARATION_SEPARATOR - 1279, 1
-[ ] S - 1280, 1
-[4cm] DECLARATION_VALUE_DIMENSION - 1281, 3
-[}] RBRACE - 1284, 1
-[
-
-] S - 1285, 4
-[@media] MEDIA - 1289, 6
-[ ] S - 1295, 1
-[aural] MEDIUM - 1296, 5
-[ ] S - 1301, 1
-[{] LBRACE - 1302, 1
-[
-    ] S - 1303, 6
-[H1] SELECTOR_ELEMENT_NAME - 1309, 2
-[,] SELECTOR_SEPARATOR - 1311, 1
-[ ] S - 1312, 1
-[H2] SELECTOR_ELEMENT_NAME - 1313, 2
-[,] SELECTOR_SEPARATOR - 1315, 1
-[ ] S - 1316, 1
-[H3] SELECTOR_ELEMENT_NAME - 1317, 2
-[,] SELECTOR_SEPARATOR - 1319, 1
-[ ] S - 1320, 1
-[H4] SELECTOR_ELEMENT_NAME - 1321, 2
-[,] SELECTOR_SEPARATOR - 1323, 1
-[ ] S - 1324, 1
-[H5] SELECTOR_ELEMENT_NAME - 1325, 2
-[,] SELECTOR_SEPARATOR - 1327, 1
-[ ] S - 1328, 1
-[H6] SELECTOR_ELEMENT_NAME - 1329, 2
-[ ] S - 1331, 1
-[{] LBRACE - 1332, 1
-[
-        ] S - 1333, 10
-[voice-family] DECLARATION_PROPERTY - 1343, 12
-[ ] S - 1355, 1
-[:] DECLARATION_SEPARATOR - 1356, 1
-[ ] S - 1357, 1
-[paul] DECLARATION_VALUE_IDENT - 1358, 4
-[,] DECLARATION_VALUE_OPERATOR - 1362, 1
-[ ] DECLARATION_VALUE_S - 1363, 1
-[child] DECLARATION_VALUE_IDENT - 1364, 5
-[;] DECLARATION_DELIMITER - 1369, 1
-[
-        ] S - 1370, 10
-[stress] DECLARATION_PROPERTY - 1380, 6
-[ ] S - 1386, 1
-[:] DECLARATION_SEPARATOR - 1387, 1
-[ ] S - 1388, 1
-[20] DECLARATION_VALUE_NUMBER - 1389, 2
-[;] DECLARATION_DELIMITER - 1391, 1
-[
-        ] S - 1392, 10
-[richness] DECLARATION_PROPERTY - 1402, 8
-[ ] S - 1410, 1
-[:] DECLARATION_SEPARATOR - 1411, 1
-[ ] S - 1412, 1
-[90] DECLARATION_VALUE_NUMBER - 1413, 2
-[;] DECLARATION_DELIMITER - 1415, 1
-[
-        ] S - 1416, 10
-[cue-before] DECLARATION_PROPERTY - 1426, 10
-[ ] S - 1436, 1
-[:] DECLARATION_SEPARATOR - 1437, 1
-[ ] S - 1438, 1
-[url("ping.au")] DECLARATION_VALUE_URI - 1439, 14
-[
-    ] S - 1453, 6
-[}] RBRACE - 1459, 1
-[
-    ] S - 1460, 6
-[P] SELECTOR_ELEMENT_NAME - 1466, 1
-[.heidi] SELECTOR_CLASS - 1467, 6
-[ ] S - 1473, 1
-[{] LBRACE - 1474, 1
-[
-        ] S - 1475, 10
-[azimuth] DECLARATION_PROPERTY - 1485, 7
-[ ] S - 1492, 1
-[:] DECLARATION_SEPARATOR - 1493, 1
-[ ] S - 1494, 1
-[center-left] DECLARATION_VALUE_IDENT - 1495, 11
-[;] DECLARATION_DELIMITER - 1506, 1
-[
-        ] S - 1507, 10
-[elevation] DECLARATION_PROPERTY - 1517, 9
-[ ] S - 1526, 1
-[:] DECLARATION_SEPARATOR - 1527, 1
-[ ] S - 1528, 1
-[12.3deg] DECLARATION_VALUE_DIMENSION - 1529, 7
-[;] DECLARATION_DELIMITER - 1536, 1
-[
-        ] S - 1537, 10
-[pause] DECLARATION_PROPERTY - 1547, 5
-[ ] S - 1552, 1
-[:] DECLARATION_SEPARATOR - 1553, 1
-[ ] S - 1554, 1
-[30ms] DECLARATION_VALUE_DIMENSION - 1555, 4
-[ ] DECLARATION_VALUE_S - 1559, 1
-[1.6s] DECLARATION_VALUE_DIMENSION - 1560, 4
-[
-    ] S - 1564, 6
-[}] RBRACE - 1570, 1
-[
-    ] S - 1571, 6
-[P] SELECTOR_ELEMENT_NAME - 1577, 1
-[.peter] SELECTOR_CLASS - 1578, 6
-[ ] S - 1584, 1
-[{] LBRACE - 1585, 1
-[
-        ] S - 1586, 10
-[azimuth] DECLARATION_PROPERTY - 1596, 7
-[ ] S - 1603, 1
-[:] DECLARATION_SEPARATOR - 1604, 1
-[ ] S - 1605, 1
-[right] DECLARATION_VALUE_IDENT - 1606, 5
-[;] DECLARATION_DELIMITER - 1611, 1
-[
-        ] S - 1612, 10
-[elevation] DECLARATION_PROPERTY - 1622, 9
-[ ] S - 1631, 1
-[:] DECLARATION_SEPARATOR - 1632, 1
-[ ] S - 1633, 1
-[-0.36rad] DECLARATION_VALUE_DIMENSION - 1634, 8
-[;] DECLARATION_DELIMITER - 1642, 1
-[
-        ] S - 1643, 10
-[pitch] DECLARATION_PROPERTY - 1653, 5
-[ ] S - 1658, 1
-[:] DECLARATION_SEPARATOR - 1659, 1
-[ ] S - 1660, 1
-[210Hz] DECLARATION_VALUE_DIMENSION - 1661, 5
-[
-    ] S - 1666, 6
-[}] RBRACE - 1672, 1
-[
-    ] S - 1673, 6
-[P] SELECTOR_ELEMENT_NAME - 1679, 1
-[.goat] SELECTOR_CLASS - 1680, 5
-[ ] S - 1685, 1
-[{] LBRACE - 1686, 1
-[
-        ] S - 1687, 10
-[volume] DECLARATION_PROPERTY - 1697, 6
-[ ] S - 1703, 1
-[:] DECLARATION_SEPARATOR - 1704, 1
-[ ] S - 1705, 1
-[x-soft] DECLARATION_VALUE_IDENT - 1706, 6
-[;] DECLARATION_DELIMITER - 1712, 1
-[
-        ] S - 1713, 10
-[elevation] DECLARATION_PROPERTY - 1723, 9
-[ ] S - 1732, 1
-[:] DECLARATION_SEPARATOR - 1733, 1
-[ ] S - 1734, 1
-[66grad] DECLARATION_VALUE_DIMENSION - 1735, 6
-[;] DECLARATION_DELIMITER - 1741, 1
-[
-        ] S - 1742, 10
-[pitch] DECLARATION_PROPERTY - 1752, 5
-[ ] S - 1757, 1
-[:] DECLARATION_SEPARATOR - 1758, 1
-[ ] S - 1759, 1
-[0.17kHz] DECLARATION_VALUE_DIMENSION - 1760, 7
-[
-    ] S - 1767, 6
-[}] RBRACE - 1773, 1
-[
-] S - 1774, 2
-[}] RBRACE - 1776, 1
-[
-
-] S - 1777, 4
-
--------
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css
deleted file mode 100644
index 3c898269e..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample01.css
+++ /dev/null
@@ -1,8 +0,0 @@
-H1 {
-
-	color: white
-	;
-
-	background-color : black
-	
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css
deleted file mode 100644
index 5a4c4dda3..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample02.css
+++ /dev/null
@@ -1,11 +0,0 @@
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' ,media1,media2,,media3 media4,media5 @import media6;
-
-<!-- /* hogehoge */
-
--->
-
-/* comment 2 */
-kuso
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css
deleted file mode 100644
index e57ccc099..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample03.css
+++ /dev/null
@@ -1,20 +0,0 @@
-@import url("../sample2.css");
-
-/* Sample Styles */
-
-BODY {
-	color : black;
-	background-color : rgb(181, 253, 211);
-	text-align : center;
-	font-family : "Heisei Mincho W3", serif
-}
-
-@page :left { margin-left : 4cm }
-
-@media aural {
-	P.heidi {
-		azimuth : center-left;
-		elevation : 12.3deg;
-		pause : 30ms 1.6s
-	}
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css
deleted file mode 100644
index d2de4f4a2..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample04.css
+++ /dev/null
@@ -1,54 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' media1,media2 , media3;
-
-@media print {
-
-}
-
-@page :left {
-
-}
-
-h1, h2, h3 {  font-family: sans-serif  }
-h1 em {  color: blue  }
-div p *[href] {  color: blue  }
-body > P {  line-height: 1.3  }
-div ol>li p { }
-math + p {  text-indent: 0  }
-h1.opener + h2 {  margin-top: -5mm  }
-h1[title] {  color: blue;  }
-span[class=example] {  color: blue;  }
-span[hello="Cleveland"][goodbye="Columbus"] {  color: blue;  }
-a[rel~="copyright"] {  color: blue  }
-a[href="http://www.w3.org/"] {  color: blue  }
-*[lang=fr] {  display : none  }
-*[lang|="en"] {  color : red  }
-DIALOGUE[character=romeo]
-{  voice-family: "Lawrence Olivier", charles, male  }
-DIALOGUE[ character = juliet ]
-{  voice-family: "Vivien Leigh", victoria, female  }
-*.pastoral {  color: green  }
-.pastoral {  color: green  }
-H1.pastoral {  color: green  }
-p.pastoral.marine {  color: green  }
-h1#chapter1 {  text-align: center  }
-div > p:first-child {  text-indent: 0  }
-p:first-child em {  font-weight : bold  }
-* > a:first-child {  font-weight : bold  }
-a:first-child {  font-weight : bold  }
-a.external:visited {  color: blue  }
-a:focus:hover {  background: white  }
-html:lang(fr) {  quotes: '<<' '>>'  }
-html:lang(de) {  quotes: '>>' '<<' '\2039' '\203A'  }
-:lang(fr) > Q {  quotes: '<<' '>>'  }
-:lang(de) > Q {  quotes: '>>' '<<' '\2039' '\203A'  }
-p:first-letter {  font-size: 3em; font-weight: normal  }
-p.special:before { content: "Special! " }
-p.special:first-letter { color: #ffd800 }
-BODY { font-family: Baskerville, "Heisi Mincho W3", Symbol, serif }
-*:lang(ja-jp) { font: 900 14pt/16pt "Heisei Mincho W9", serif }
-*:lang(zh-tw) { font: 800 14pt/16.5pt "Li Sung", serif }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css
deleted file mode 100644
index d2de4f4a2..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample05.css
+++ /dev/null
@@ -1,54 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("hoge.css");
-@import /* comment */ url(hoge.css);
-@import "hoge.css" /* comment */;
-@IMPORT 'hoge.css' media1,media2 , media3;
-
-@media print {
-
-}
-
-@page :left {
-
-}
-
-h1, h2, h3 {  font-family: sans-serif  }
-h1 em {  color: blue  }
-div p *[href] {  color: blue  }
-body > P {  line-height: 1.3  }
-div ol>li p { }
-math + p {  text-indent: 0  }
-h1.opener + h2 {  margin-top: -5mm  }
-h1[title] {  color: blue;  }
-span[class=example] {  color: blue;  }
-span[hello="Cleveland"][goodbye="Columbus"] {  color: blue;  }
-a[rel~="copyright"] {  color: blue  }
-a[href="http://www.w3.org/"] {  color: blue  }
-*[lang=fr] {  display : none  }
-*[lang|="en"] {  color : red  }
-DIALOGUE[character=romeo]
-{  voice-family: "Lawrence Olivier", charles, male  }
-DIALOGUE[ character = juliet ]
-{  voice-family: "Vivien Leigh", victoria, female  }
-*.pastoral {  color: green  }
-.pastoral {  color: green  }
-H1.pastoral {  color: green  }
-p.pastoral.marine {  color: green  }
-h1#chapter1 {  text-align: center  }
-div > p:first-child {  text-indent: 0  }
-p:first-child em {  font-weight : bold  }
-* > a:first-child {  font-weight : bold  }
-a:first-child {  font-weight : bold  }
-a.external:visited {  color: blue  }
-a:focus:hover {  background: white  }
-html:lang(fr) {  quotes: '<<' '>>'  }
-html:lang(de) {  quotes: '>>' '<<' '\2039' '\203A'  }
-:lang(fr) > Q {  quotes: '<<' '>>'  }
-:lang(de) > Q {  quotes: '>>' '<<' '\2039' '\203A'  }
-p:first-letter {  font-size: 3em; font-weight: normal  }
-p.special:before { content: "Special! " }
-p.special:first-letter { color: #ffd800 }
-BODY { font-family: Baskerville, "Heisi Mincho W3", Symbol, serif }
-*:lang(ja-jp) { font: 900 14pt/16pt "Heisei Mincho W9", serif }
-*:lang(zh-tw) { font: 800 14pt/16.5pt "Li Sung", serif }
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css
deleted file mode 100644
index ea73cea11..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample06.css
+++ /dev/null
@@ -1,10 +0,0 @@
-declaration {
-	dimension : 100ex;
-	function : rect(100, 200, 300, 400), format("intellifont"), local("Excelsior Cyrilllic Upright");
-	hash : #aabbcc;
-	ident : any;
-	number : 99999;
-	percentage : 100%;
-	string : "string";
-	unicode-range : U+??, U+100-220, U+4??;
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css
deleted file mode 100644
index fd3472965..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/testfiles/sample07.css
+++ /dev/null
@@ -1,82 +0,0 @@
-@charset "ISO-8859-1";
-
-@import url("../sample2.css") projection, tv;
-
-BODY {
-    color : black;
-    text-align : center;
-    background-color : rgb( 181, 253, 211 )
-}
-
-UL {
-    color : black;
-    list-style-image : url("images/l_a01.gif");
-    list-style-position : outside
-}
-
-H1 {
-    color : white;
-    text-align : center;
-    border-left-color : #996666;
-    padding-top : 0px;
-    padding-right : 1cm;
-    padding-bottom : 2;
-    padding-left : 3em;
-    border-style : solid;
-    border-top-width : 4.5ex;
-    border-right-width : 5in;
-    border-bottom-width : 6.02mm;
-    border-left-width : 7
-}
-
-H1:before {
-    content : "Chapter " counter( chapter ) ". ";
-    counter-increment : chapter;
-    counter-reset : section
-}
-
-IMG:before {content : attr(alt)}
-
-DIV.sample {
-    font-family : "Robson Celtic", sans-serif;
-    position : absolute;
-    left : 833.5pc;
-    top : 90%;
-    width : 100pt;
-    height : 110.777px;
-    clip : rect( -5px, 80px, 130px, 0px )
-}
-
-@font-face {
-    font-family : "Swiss 721";
-    src : url("swiss721t.pfr") format("intellifont"), local("Excelsior Cyrilllic Upright");
-    unicode-range : U+??, U+100-220, U+4??;
-    font-weight : 100, 200, 300, 400, 500
-}
-
-@page :left {margin-left : 4cm}
-
-@media aural {
-    H1, H2, H3, H4, H5, H6 {
-        voice-family : paul, child;
-        stress : 20;
-        richness : 90;
-        cue-before : url("ping.au")
-    }
-    P.heidi {
-        azimuth : center-left;
-        elevation : 12.3deg;
-        pause : 30ms 1.6s
-    }
-    P.peter {
-        azimuth : right;
-        elevation : -0.36rad;
-        pitch : 210Hz
-    }
-    P.goat {
-        volume : x-soft;
-        elevation : 66grad;
-        pitch : 0.17kHz
-    }
-}
-
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java
deleted file mode 100644
index 568e089fa..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/FileUtil.java
+++ /dev/null
@@ -1,105 +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.css.core.tests.util;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-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.osgi.framework.Bundle;
-
-/**
- * 
- */
-public class FileUtil {
-	public static final String commonEOL = "\r\n";
-
-	public static File createFile(String directory, String filename) throws IOException {
-		Bundle bundle = Platform.getBundle("org.eclipse.wst.css.core.tests"); //$NON-NLS-1$
-		URL url = bundle.getEntry("/"); //$NON-NLS-1$
-		URL localURL = FileLocator.toFileURL(url);
-		String installPath = localURL.getPath();
-		String totalDirectory = installPath + directory;
-		String totalPath = totalDirectory + "/" + filename; //$NON-NLS-1$
-		URL totalURL = new URL(url, totalPath);
-		String finalFile = totalURL.getFile();
-		File file = new File(finalFile);
-		return file;
-	}
-
-	// public static Reader createReader(File file) throws
-	// FileNotFoundException {
-	// return new FileReader(file);
-	// }
-	//	
-	// public static Reader createReader(String directory, String filename)
-	// throws IOException {
-	// File file = createFile(directory, filename);
-	// return createReader(file);
-	// }
-
-	public static String createString(String directory, String filename) throws FileNotFoundException, IOException {
-		StringBuffer buf = new StringBuffer();
-		Reader fileReader = new FileReader(createFile(directory, filename));
-		BufferedReader reader = new BufferedReader(fileReader);
-		String line;
-		while ((line = reader.readLine()) != null) {
-			buf.append(line);
-			buf.append(commonEOL);
-		}
-		return buf.toString();
-		// return new DataInputStream(new
-		// FileInputStream(createFile(directory, filename))).readUTF();
-	}
-
-	static int uniqueNum = 0;
-
-	public static ICSSModel createModel() {
-		IStructuredModel model = null;
-		try {
-
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-
-			model = modelManager.getModelForEdit("test" + uniqueNum++ + ".css", new NullInputStream(), null); //$NON-NLS-1$
-
-			// always use the same line delimiter for these tests, regardless
-			// of plaform or preference settings
-			model.getStructuredDocument().setLineDelimiter(commonEOL);
-
-
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		return (ICSSModel) model;
-
-	}
-
-	public static void dumpString(String string, String directory, String filename) throws IOException {
-		File file = createFile(directory, filename);
-		Writer writer = new FileWriter(file);
-		writer.write(string);
-		writer.close();
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java
deleted file mode 100644
index ad9b2fdf2..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/NullInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-public class NullInputStream extends InputStream {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#mark(int)
-	 */
-	public synchronized void mark(int readlimit) {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#markSupported()
-	 */
-	public boolean markSupported() {
-		// we can mark nothing.
-		// and, we are using this Null class specifically for
-		// a "fake" resettable stream.
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#read()
-	 */
-	public int read() throws IOException {
-
-		return -1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#reset()
-	 */
-	public synchronized void reset() throws IOException {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#skip(long)
-	 */
-	public long skip(long n) throws IOException {
-		return 0;
-	}
-}
diff --git a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/StringCompareUtil.java b/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/StringCompareUtil.java
deleted file mode 100644
index d4b372360..000000000
--- a/tests/org.eclipse.wst.css.core.tests/src/org/eclipse/wst/css/core/tests/util/StringCompareUtil.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.core.tests.util;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
-	public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
-		if (string1 == null)
-			return false;
-		if (string2 == null)
-			return false;
-
-		StringReader s1Reader = new StringReader(string1);
-		StringReader s2Reader = new StringReader(string2);
-
-		// assume true unless find evidence to the contrary
-		boolean result = true;
-		int s1Char = -1;
-		int s2Char = -1;
-		do {
-
-			s1Char = getNextChar(s1Reader);
-
-			s2Char = getNextChar(s2Reader);
-
-			if (s1Char != s2Char) {
-				result = false;
-				break;
-			}
-		}
-		while (s1Char != -1 && s2Char != -1);
-
-		return result;
-	}
-
-	/**
-	 * Method getNextChar.
-	 * @param s1Reader
-	 * @return char
-	 */
-	private int getNextChar(StringReader reader) {
-		int nextChar = -1;
-		try {
-			nextChar = reader.read();
-			while (isEOL(nextChar)) {
-				nextChar = reader.read();
-			}
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-		return nextChar;
-	}
-
-	private boolean isEOL(int aChar) {
-		return (aChar == '\n' || aChar == '\r');
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.core.tests/test.xml b/tests/org.eclipse.wst.css.core.tests/test.xml
deleted file mode 100644
index d653a3dd5..000000000
--- a/tests/org.eclipse.wst.css.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-    
-	<property
-		name="plugin-name"
-		value="org.eclipse.wst.css.core.tests" />
-    <property
-        name="classname"
-        value="org.eclipse.wst.css.core.tests.CSSCoreTestSuite" />
-    <property
-        name="testType"
-        value="core-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.classpath b/tests/org.eclipse.wst.css.tests.encoding/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.cvsignore b/tests/org.eclipse.wst.css.tests.encoding/.cvsignore
deleted file mode 100644
index 06101b98d..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-cssencodingtests.jar
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.project b/tests/org.eclipse.wst.css.tests.encoding/.project
deleted file mode 100644
index ea358d590..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.css.tests.encoding</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.css.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index 311836e8c..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.css.tests.encoding
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: cssencodingtests.jar
-Bundle-Activator: org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.tests.encoding,
- org.eclipse.wst.css.tests.encoding.css
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.css.core,
- org.junit,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.xml.tests.encoding
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.wst.css.tests.encoding/about.html b/tests/org.eclipse.wst.css.tests.encoding/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.css.tests.encoding/build.properties b/tests/org.eclipse.wst.css.tests.encoding/build.properties
deleted file mode 100644
index 59600544b..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = cssencodingtests.jar,\
-               testfiles/,\
-               test.xml,\
-               META-INF/,\
-               about.html
-src.includes = cssencodingtests.jar
-source.cssencodingtests.jar = src/
-output.cssencodingtests.jar = bin/
-               
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/plugin.properties b/tests/org.eclipse.wst.css.tests.encoding/plugin.properties
deleted file mode 100644
index 053e96956..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.css.tests.encoding
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = CSS Encoding Tests Plug-in
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java
deleted file mode 100644
index e3e728955..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +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.css.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.tests.encoding.css.CSSEncodingTester;
-import org.eclipse.wst.css.tests.encoding.css.CSSHeadTokenizerTester;
-import org.eclipse.wst.css.tests.encoding.css.TestContentTypeDetectionForCSS;
-
-public class CSSEncodingTestSuite extends TestSuite {
-
-	private static Class[] classes = new Class[]{CSSEncodingTester.class, CSSHeadTokenizerTester.class, TestContentTypeDetectionForCSS.class};
-
-	public static Test suite() {
-		return new CSSEncodingTestSuite();
-	}
-
-	public CSSEncodingTestSuite() {
-		super("CSS Encoding Test Suite");
-		for (int i = 0; i < classes.length; i++) {
-			addTest(new TestSuite(classes[i], classes[i].getName()));
-		}
-	}
-
-	/**
-	 * @param theClass
-	 */
-	public CSSEncodingTestSuite(Class theClass) {
-		super(theClass);
-	}
-
-	/**
-	 * @param theClass
-	 * @param name
-	 */
-	public CSSEncodingTestSuite(Class theClass, String name) {
-		super(theClass, name);
-	}
-
-	/**
-	 * @param name
-	 */
-	public CSSEncodingTestSuite(String name) {
-		super(name);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java
deleted file mode 100644
index 49ed324b0..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/CSSEncodingTestsPlugin.java
+++ /dev/null
@@ -1,141 +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.css.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-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 CSSEncodingTestsPlugin extends Plugin {
-	// The shared instance.
-	private static CSSEncodingTestsPlugin plugin;
-
-	public static List getAllTestFiles(String topDirName) {
-		List result = null;
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + topDirName;
-		File topDir = new File(location);
-		if (!topDir.isDirectory()) {
-			throw new IllegalArgumentException(topDirName + " is not a directory");
-		}
-		result = getFilesInDir(topDir);
-		return result;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static CSSEncodingTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	private static List getFilesInDir(File topDir) {
-		List files = new ArrayList();
-		File[] topFiles = topDir.listFiles();
-		for (int i = 0; i < topFiles.length; i++) {
-			File file = topFiles[i];
-			if (file.isFile()) {
-				files.add(file);
-			}
-			else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
-				List innerFiles = getFilesInDir(file);
-				files.addAll(innerFiles);
-			}
-		}
-		return files;
-	}
-
-	public static URL getInstallLocation() {
-		URL installLocation = Platform.getBundle("org.eclipse.wst.css.tests.encoding").getEntry("/");
-		URL resolvedLocation = null;
-		try {
-			resolvedLocation = FileLocator.resolve(installLocation);
-		}
-		catch (IOException e) {
-			// impossible
-			throw new Error(e);
-		}
-		return resolvedLocation;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = CSSEncodingTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null ? bundle.getString(key) : key);
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	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;
-	}
-
-	public static Reader getTestReader(String filepath) throws FileNotFoundException {
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		Reader result = new FileReader(location);
-		return result;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public CSSEncodingTestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return null;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java
deleted file mode 100644
index 4f0b0fff3..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSEncodingTester.java
+++ /dev/null
@@ -1,171 +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.css.tests.encoding.css;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.contenttype.CSSResourceEncodingDetector;
-import org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class CSSEncodingTester extends TestCase {
-
-	/**
-	 * Ensures that an InputStream has mark/reset support.
-	 */
-	private static InputStream getMarkSupportedStream(InputStream original) {
-		if (original == null)
-			return null;
-		if (original.markSupported())
-			return original;
-		return new BufferedInputStream(original);
-	}
-	private boolean DEBUG = false;
-	private final String fileDir = "css/";
-	// private final String pluginLocation =
-	// TestsPlugin.getInstallLocation().toString();
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
-	private int READ_BUFFER_SIZE = 8000;
-
-	private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
-		File file = CSSEncodingTestsPlugin.getTestFile(filename);
-		if (!file.exists())
-			throw new IllegalArgumentException(filename + " was not found");
-		InputStream inputStream = new FileInputStream(file);
-		// InputStream inStream = getClass().getResourceAsStream(filename);
-		InputStream istream = getMarkSupportedStream(inputStream);
-		try {
-			detector.set(istream);
-			EncodingMemento encodingMemento = ((CSSResourceEncodingDetector)detector).getEncodingMemento();
-
-			String foundIANAEncoding = null;
-
-			if (encodingMemento != null) {
-				foundIANAEncoding = encodingMemento.getDetectedCharsetName();
-			}
-			// I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
-			// since
-			// some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
-			// We do want to be tolerant on input, and accept either, but I
-			// think
-			// that SupportedJavaEncodings needs to be changed to "recommend"
-			// Shift_JIS.
-			boolean expectedIANAResult = false;
-			if (expectedIANAEncoding == null) {
-				expectedIANAResult = expectedIANAEncoding == foundIANAEncoding;
-			}
-			else {
-				expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-			}
-
-			assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
-			// a very simple read test ... will cause JUnit error (not fail)
-			// if
-			// throws exception.
-			if (foundIANAEncoding != null) {
-				ensureCanRead(filename, foundIANAEncoding, istream);
-			}
-		}
-		finally {
-			if (istream != null) {
-				istream.close();
-			}
-			if (inputStream != null) {
-				inputStream.close();
-			}
-		}
-	}
-
-	/**
-	 * This method just reads to stream, to be sure it can be read per
-	 * encoding, without exception.
-	 */
-	private void ensureCanRead(String filename, String encoding, InputStream inputStream) throws IOException {
-		Charset charset = Charset.forName(encoding);
-		CharsetDecoder charsetDecoder = charset.newDecoder();
-		charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
-		charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
-		InputStreamReader reader = new InputStreamReader(inputStream, charsetDecoder);
-		StringBuffer stringBuffer = readInputStream(reader);
-		if (DEBUG) {
-			System.out.println();
-			System.out.println(filename);
-			System.out.println(stringBuffer.toString());
-		}
-	}
-
-	private StringBuffer readInputStream(Reader reader) throws IOException {
-
-		StringBuffer buffer = new StringBuffer();
-		int numRead = 0;
-		char tBuff[] = new char[READ_BUFFER_SIZE];
-		while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
-			buffer.append(tBuff, 0, numRead);
-		}
-		return buffer;
-	}
-
-	public void testBestCase() throws IOException {
-		String filename = fileLocation + "nonStandard.css";
-		doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
-
-	}
-
-	public void testEmptyFile() throws IOException {
-		String filename = fileLocation + "emptyFile.css";
-		doTestFileStream(filename, null, new CSSResourceEncodingDetector());
-	}
-
-	public void testEUCJP() throws IOException {
-		String filename = fileLocation + "encoding_test_eucjp.css";
-		doTestFileStream(filename, "EUC-JP", new CSSResourceEncodingDetector());
-	}
-
-	public void testJIS() throws IOException {
-		String filename = fileLocation + "encoding_test_jis.css";
-		doTestFileStream(filename, "ISO-2022-JP", new CSSResourceEncodingDetector());
-	}
-
-	public void testNoEncoding() throws IOException {
-		String filename = fileLocation + "noEncoding.css";
-		doTestFileStream(filename, null, new CSSResourceEncodingDetector());
-	}
-
-	public void testnonStandardIllFormed() throws IOException {
-		String filename = fileLocation + "nonStandardIllFormed.css";
-		doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
-	}
-
-	public void testnonStandardIllFormed2() throws IOException {
-		String filename = fileLocation + "nonStandardIllFormed2.css";
-		doTestFileStream(filename, "ISO-8859-6", new CSSResourceEncodingDetector());
-	}
-
-	public void testShiftJIS() throws IOException {
-		String filename = fileLocation + "encoding_test_sjis.css";
-		doTestFileStream(filename, "SHIFT_JIS", new CSSResourceEncodingDetector());
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java
deleted file mode 100644
index e89741cf9..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/CSSHeadTokenizerTester.java
+++ /dev/null
@@ -1,147 +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.css.tests.encoding.css;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizer;
-import org.eclipse.wst.css.core.internal.contenttype.CSSHeadTokenizerConstants;
-import org.eclipse.wst.css.core.internal.contenttype.HeadParserToken;
-import org.eclipse.wst.css.tests.encoding.CSSEncodingTestsPlugin;
-
-public class CSSHeadTokenizerTester extends TestCase {
-	private boolean DEBUG = false;
-	private String fcharset;
-	private final String fileDir = "css/";
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = this.fileHome + this.fileDir;
-
-	private void doTestFile(String filename, String expectedName) throws IOException {
-		doTestFile(filename, expectedName, null);
-	}
-
-	private void doTestFile(String filename, String expectedName, String finalTokenType) throws IOException {
-		CSSHeadTokenizer tokenizer = null;
-		Reader fileReader = null;
-		try {
-			if (this.DEBUG) {
-				System.out.println();
-				System.out.println("       " + filename);
-				System.out.println();
-			}
-			fileReader = CSSEncodingTestsPlugin.getTestReader(filename);
-			tokenizer = new CSSHeadTokenizer(fileReader);
-		}
-		catch (IOException e) {
-			System.out.println("Error opening file \"" + filename + "\"");
-			throw e;
-		}
-
-		HeadParserToken resultToken = null;
-		HeadParserToken token = parseHeader(tokenizer);
-		String resultValue = this.fcharset;
-		fileReader.close();
-		if (finalTokenType != null) {
-			assertTrue("did not end as expected. found:  " + token.getType(), finalTokenType.equals(token.getType()));
-		}
-		else {
-			if (expectedName == null) {
-				assertTrue("expected no encoding, but found: " + resultValue, resultToken == null);
-			}
-			else {
-				assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue));
-			}
-		}
-
-	}
-
-	private boolean isLegalString(String tokenType) {
-		boolean result = false;
-		if (tokenType == null) {
-			result = false;
-		}
-		else {
-			result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
-		}
-		return result;
-	}
-
-	/**
-	 * Give's priority to encoding value, if found else, looks for contentType
-	 * value;
-	 */
-	private HeadParserToken parseHeader(CSSHeadTokenizer tokenizer) throws IOException {
-		HeadParserToken token = null;
-		HeadParserToken finalToken = null;
-		do {
-			token = tokenizer.getNextToken();
-			String tokenType = token.getType();
-			if (tokenType == CSSHeadTokenizerConstants.CHARSET_RULE) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						this.fcharset = valueToken.getText();
-
-					}
-				}
-			}
-		}
-		while (tokenizer.hasMoreTokens());
-		finalToken = token;
-		return finalToken;
-
-	}
-
-	public void testBestCase() throws IOException {
-		String filename = this.fileLocation + "nonStandard.css";
-		doTestFile(filename, "ISO-8859-6");
-
-	}
-
-	public void testEmptyFile() throws IOException {
-		String filename = this.fileLocation + "emptyFile.css";
-		doTestFile(filename, null);
-	}
-
-	public void testEUCJP() throws IOException {
-		String filename = this.fileLocation + "encoding_test_eucjp.css";
-		doTestFile(filename, "EUC-JP");
-	}
-
-	public void testJIS() throws IOException {
-		String filename = this.fileLocation + "encoding_test_jis.css";
-		doTestFile(filename, "ISO-2022-JP");
-	}
-
-	public void testNoEncoding() throws IOException {
-		String filename = this.fileLocation + "noEncoding.css";
-		doTestFile(filename, null);
-	}
-
-	public void testnonStandardIllFormed() throws IOException {
-		String filename = this.fileLocation + "nonStandardIllFormed.css";
-		doTestFile(filename, "ISO-8859-6");
-	}
-
-	public void testnonStandardIllFormed2() throws IOException {
-		String filename = this.fileLocation + "nonStandardIllFormed2.css";
-		doTestFile(filename, "ISO-8859-6");
-	}
-
-	public void testShiftJIS() throws IOException {
-		String filename = this.fileLocation + "encoding_test_sjis.css";
-		doTestFile(filename, "SHIFT_JIS");
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java
deleted file mode 100644
index cc60cd8a8..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/EncodingParserConstants.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.tests.encoding.css;
-
-
-public interface EncodingParserConstants {
-
-	final String EOF = "EOF"; //$NON-NLS-1$
-	final String InvalidTerminatedStringValue = "InvalidTerminatedStringValue"; //$NON-NLS-1$
-	final String InvalidTermintatedUnDelimitedStringValue = "InvalidTermintatedUnDelimitedStringValue"; //$NON-NLS-1$
-	final String MAX_CHARS_REACHED = "MAX_CHARS_REACHED"; //$NON-NLS-1$
-	final String StringValue = "strval"; //$NON-NLS-1$
-	final String UnDelimitedStringValue = "UnDelimitedStringValue"; //$NON-NLS-1$
-	public final String UTF16BE = "UTF16BE"; //$NON-NLS-1$
-	public final String UTF16LE = "UTF16LE"; //$NON-NLS-1$
-
-
-	public final String UTF83ByteBOM = "UTF83ByteBOM"; //$NON-NLS-1$
-
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java b/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java
deleted file mode 100644
index 7468724ce..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/src/org/eclipse/wst/css/tests/encoding/css/TestContentTypeDetectionForCSS.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.css.tests.encoding.css;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForCSS extends TestContentTypeDetection {
-	public void testFile7() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandardIllFormed.css", null);
-	}
-
-	public void testFile1001() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/emptyFile.css", null);
-	}
-
-	public void testFile1002() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_eucjp.css", null);
-	}
-
-	public void testFile1003() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_jis.css", null);
-	}
-
-	public void testFile4() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/encoding_test_sjis.css", null);
-	}
-
-
-	public void testFile5() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/noEncoding.css", null);
-	}
-
-	public void testFile6() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandard.css", null);
-	}
-
-	public void testFile8() throws CoreException, IOException {
-		doTest("org.eclipse.wst.css.core.csssource", "testfiles/css/nonStandardIllFormed2.css", null);
-	}
-
-}
diff --git a/tests/org.eclipse.wst.css.tests.encoding/test.xml b/tests/org.eclipse.wst.css.tests.encoding/test.xml
deleted file mode 100644
index 8d6533761..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-
-    <property
-        name="plugin-name"
-        value="org.eclipse.wst.css.tests.encoding" />
-    <property
-        name="classname"
-        value="org.eclipse.wst.css.tests.encoding.CSSEncodingTestSuite" />
-    <property
-        name="testType"
-        value="core-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/emptyFile.css
+++ /dev/null
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css
deleted file mode 100644
index 1e256e7ca..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_eucjp.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "EUC-JP";
-
-BODY {
-	font-family : "�ͣ� �Х����å�";
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css
deleted file mode 100644
index 384768beb..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_jis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-2022-JP";
-
-BODY {
-	font-family : "$B#M#S(B $B#P%4%7%C%/(B";
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css
deleted file mode 100644
index e529cda9e..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/encoding_test_sjis.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "SHIFT_JIS";
-
-BODY {
-	font-family : "�l�r �o�S�V�b�N";
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css
deleted file mode 100644
index f3f06bc9e..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/noEncoding.css
+++ /dev/null
@@ -1,46 +0,0 @@
-BODY {
-	font-family: "Times New Roman", "MS Sans Serif";
-	text-decoration: none;
-	background-color: white;
-}
-
-TD {
-	font-family: "Times New Roman";
-	font-size: 12pt;
-	color: black;
-	font-style: normal;
-	text-align: left;
-}
-
-TH {
-	font-family: "Times New Roman";
-	font-size: 12pt;
-	color: black;
-	font-style: normal;
-	font-weight: bolder;
-	text-align: left;
-}
-
-H1 {
-	font-family: "Times New Roman";
-	font-size: 14pt;
-	color: black;
-	font-style: normal;
-	font-weight: bolder;
-	text-align: center
-}
-
-H2 {
-	font-family: "Times New Roman";
-	font-size: 12pt;
-	color: black;
-	font-style: normal;
-	font-weight: bolder
-}
-
-H3 {
-	font-family: "Times New Roman";
-	font-size: 12pt;
-	color: black;
-	font-style: italic  
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css
deleted file mode 100644
index dc997ebbc..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandard.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css
deleted file mode 100644
index f1a4e44ab..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@charset "ISO-8859-6;
-
-
-
-
diff --git a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css b/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css
deleted file mode 100644
index 53c8a1fd0..000000000
--- a/tests/org.eclipse.wst.css.tests.encoding/testfiles/css/nonStandardIllFormed2.css
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-    @charset "ISO-8859-6";
-
-
-
-
diff --git a/tests/org.eclipse.wst.css.ui.tests/.classpath b/tests/org.eclipse.wst.css.ui.tests/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.css.ui.tests/.cvsignore b/tests/org.eclipse.wst.css.ui.tests/.cvsignore
deleted file mode 100644
index fb621e75d..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-org.eclipse.wst.css.ui.tests_1.0.0.jar
-cssuitests.jar
-temp.folder
-PerformanceResults
diff --git a/tests/org.eclipse.wst.css.ui.tests/.project b/tests/org.eclipse.wst.css.ui.tests/.project
deleted file mode 100644
index d41d16cab..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.css.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.css.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 7ed46c76c..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.css.ui.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.wst.css.ui.tests.CSSUITestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.ui.tests,
- org.eclipse.wst.css.ui.tests.viewer
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.wst.css.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.css.core,
- org.eclipse.jface.text,
- org.eclipse.ui.workbench,
- org.eclipse.ui.editors,
- org.eclipse.wst.sse.core,
- org.junit
-Eclipse-LazyStart: true
-Bundle-ClassPath: cssuitests.jar
diff --git a/tests/org.eclipse.wst.css.ui.tests/about.html b/tests/org.eclipse.wst.css.ui.tests/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.wst.css.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.css.ui.tests/build.properties b/tests/org.eclipse.wst.css.ui.tests/build.properties
deleted file mode 100644
index dae53b918..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = META-INF/,\
-               cssuitests.jar,\
-               about.html,\
-               src/,\
-               test.xml
-jars.compile.order = cssuitests.jar
-source.cssuitests.jar = src/
-output.cssuitests.jar = bin/
diff --git a/tests/org.eclipse.wst.css.ui.tests/plugin.properties b/tests/org.eclipse.wst.css.ui.tests/plugin.properties
deleted file mode 100644
index 21ad1f73e..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.css.ui.tests
-Bundle-Vendor.0 = Eclipse
-Bundle-Name.0 = CSS UI Tests Plug-in
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java
deleted file mode 100644
index e1bef5c76..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestSuite.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.wst.css.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.css.ui.tests.viewer.TestViewerConfigurationCSS;
-
-public class CSSUITestSuite extends TestSuite {
-	public static Test suite() {
-		return new CSSUITestSuite();
-	}
-
-	public CSSUITestSuite() {
-		super("CSS UI Test Suite");
-		addTest(new TestSuite(ExistenceTest.class, "CSS UI Existence Test"));
-		addTest(new TestSuite(TestViewerConfigurationCSS.class));
-		addTest(new TestSuite(TestEditorConfigurationCSS.class));
-	}
-}	
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestsPlugin.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestsPlugin.java
deleted file mode 100644
index 21f0f047c..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/CSSUITestsPlugin.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.wst.css.ui.tests;
-
-import org.eclipse.ui.plugin.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSUITestsPlugin extends AbstractUIPlugin {
-
-	//The shared instance.
-	private static CSSUITestsPlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public CSSUITestsPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static CSSUITestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.wst.css.ui.tests", path);
-	}
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java
deleted file mode 100644
index 893127f34..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/ExistenceTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.wst.css.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-
-/**
- * 
- * @since 1.0
- */
-public class ExistenceTest extends TestCase {
-	/**
-	 * tests if CSSUIPlugin can be loaded
-	 */
-	public void testExists() {
-		Plugin p = CSSUIPlugin.getDefault();
-		assertNotNull("couldn't load CSS UI plugin", p);
-	}
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/TestEditorConfigurationCSS.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/TestEditorConfigurationCSS.java
deleted file mode 100644
index 94e30bba9..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/TestEditorConfigurationCSS.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.css.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.ui.StructuredTextViewerConfigurationCSS;
-import org.eclipse.wst.css.ui.views.contentoutline.CSSContentOutlineConfiguration;
-import org.eclipse.wst.css.ui.views.properties.CSSPropertySheetConfiguration;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-
-/**
- * Tests retrieving editor contributions for css content type
- */
-public class TestEditorConfigurationCSS extends TestCase {
-	public void testGetSourceViewerConfiguration() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForCSS.ContentTypeID_CSS);
-		assertNotNull("no source viewer configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected source viewer configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o.getClass(), StructuredTextViewerConfigurationCSS.class);
-	}
-
-	public void testGetContentOutlineViewerConfiguration() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForCSS.ContentTypeID_CSS);
-		assertNotNull("no content outline configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected content outline configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o.getClass(), CSSContentOutlineConfiguration.class);
-	}
-
-	public void testGetPropertySheetConfiguration() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.PROPERTYSHEETCONFIGURATION, ContentTypeIdForCSS.ContentTypeID_CSS);
-		assertNotNull("no property sheet configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected property sheet configuration for " + ContentTypeIdForCSS.ContentTypeID_CSS, o.getClass(), CSSPropertySheetConfiguration.class);
-	}
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestViewerConfigurationCSS.java b/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestViewerConfigurationCSS.java
deleted file mode 100644
index f1a1ad769..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/src/org/eclipse/wst/css/ui/tests/viewer/TestViewerConfigurationCSS.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package org.eclipse.wst.css.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.reconciler.IReconciler;
-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.PlatformUI;
-import org.eclipse.wst.css.core.text.ICSSPartitions;
-import org.eclipse.wst.css.ui.StructuredTextViewerConfigurationCSS;
-import org.eclipse.wst.css.ui.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-public class TestViewerConfigurationCSS extends TestCase {
-
-	private StructuredTextViewerConfigurationCSS fConfig = null;
-	private boolean fDisplayExists = true;
-	private StructuredTextViewer fViewer = null;
-	private boolean isSetup = false;
-
-	public TestViewerConfigurationCSS() {
-		super("TestViewerConfigurationCSS");
-	}
-
-	protected void setUp() throws Exception {
-
-		super.setUp();
-		if (!this.isSetup) {
-			setUpViewerConfiguration();
-			this.isSetup = true;
-		}
-	}
-
-	private void setUpViewerConfiguration() {
-
-		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
-			fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-			fConfig = new StructuredTextViewerConfigurationCSS();
-		}
-		else {
-			fDisplayExists = false;
-			Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
-		}
-	}
-
-	public void testGetAutoEditStrategies() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, ICSSPartitions.STYLE);
-		assertNotNull(strategies);
-		assertTrue("there are no auto edit strategies", strategies.length > 0);
-	}
-
-	public void testGetConfiguredContentTypes() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		assertNotNull(configuredContentTypes);
-		assertTrue("there are no configured content types", configuredContentTypes.length > 1);
-	}
-
-	/*
-	 * not necessary
-	 */
-	public void testGetContentAssistant() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IContentAssistant ca = fConfig.getContentAssistant(fViewer);
-		assertNotNull("there is no content assistant", ca);
-	}
-
-	public void testGetContentFormatter() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IContentFormatter cf = fConfig.getContentFormatter(fViewer);
-		assertNotNull("there is no content formatter", cf);
-	}
-
-	/*
-	 * not necessary
-	 */
-	public void testGetDoubleClickStrategy() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
-			if (strategy != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured double click strategies", false);
-	}
-
-	/*
-	 * not necessary
-	 */
-	public void testGetHyperlinkDetectors() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
-		assertNotNull("there are no hyperlink detectors", detectors);
-		assertTrue("there are no hyperlink detectors", detectors.length > 0);
-	}
-
-	public void testGetIndentPrefixes() {
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			String prefixes[] = fConfig.getIndentPrefixes(fViewer, contentTypes[i]);
-			if (prefixes != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured indent prefixes", false);
-	}
-
-	/*
-	 * not necessary
-	 */
-	public void testGetInformationControlCreator() {
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IInformationControlCreator infoCreator = fConfig.getInformationControlCreator(fViewer);
-		assertNotNull("InformationControlCreator is null", infoCreator);
-	}
-
-	/*
-	 * not necessary
-	 */
-	public void testGetInformationPresenter() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
-		assertNotNull("InformationPresenter is null", presenter);
-	}
-
-	public void testGetLineStyleProviders() {
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
-			if (providers != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured line style providers", false);
-	}
-
-	/*
-	 * not necessary
-	 */
-	public void testGetReconciler() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IReconciler r = fConfig.getReconciler(fViewer);
-		assertNotNull("Reconciler not null", r);
-	}
-
-	/*
-	 * not necessary
-	 */
-	public void testGetTextHover() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String[] hoverPartitions = new String[]{ICSSPartitions.STYLE};
-		for (int i = 0; i < hoverPartitions.length; i++) {
-			ITextHover hover = fConfig.getTextHover(fViewer, hoverPartitions[i], SWT.NONE);
-			assertNotNull("hover was null for partition: " + hoverPartitions[i], hover);
-		}
-	}
-}
diff --git a/tests/org.eclipse.wst.css.ui.tests/test.xml b/tests/org.eclipse.wst.css.ui.tests/test.xml
deleted file mode 100644
index f55274dd6..000000000
--- a/tests/org.eclipse.wst.css.ui.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-
-    <property
-        name="plugin-name"
-        value="org.eclipse.wst.css.ui.tests" />
-    <property
-        name="classname"
-        value="org.eclipse.wst.css.ui.tests.CSSUITestSuite" />
-    <property
-        name="testType"
-        value="ui-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.classpath b/tests/org.eclipse.wst.dtd.ui.tests/.classpath
deleted file mode 100644
index a99584684..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.cvsignore b/tests/org.eclipse.wst.dtd.ui.tests/.cvsignore
deleted file mode 100644
index 65ebfe74a..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-dtduitests.jar
-temp.folder
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.project b/tests/org.eclipse.wst.dtd.ui.tests/.project
deleted file mode 100644
index f497e031a..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.dtd.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.dtd.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec575022..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac712..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7adde..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bba7..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 1e933beb5..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.dtd.ui.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: dtduitests.jar
-Bundle-Activator: org.eclipse.wst.dtd.ui.tests.internal.DTDUITestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.dtd.ui.tests,
- org.eclipse.wst.dtd.ui.tests.internal;x-internal:=true,
- org.eclipse.wst.dtd.ui.tests.viewer
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.eclipse.ui,
- org.eclipse.ui.views,
- org.eclipse.ui.workbench,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.core.resources,
- org.eclipse.wst.dtd.core,
- org.eclipse.wst.dtd.ui,
- org.eclipse.wst.sse.core,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.core,
- org.junit,
- com.ibm.icu
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/about.html b/tests/org.eclipse.wst.dtd.ui.tests/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.wst.dtd.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.dtd.ui.tests/build.properties b/tests/org.eclipse.wst.dtd.ui.tests/build.properties
deleted file mode 100644
index 939b03678..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.dtduitests.jar = src/
-output.dtduitests.jar = bin/
-bin.includes = dtduitests.jar,\
-               test.xml,\
-               META-INF/,\
-               about.html
-
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/plugin.properties b/tests/org.eclipse.wst.dtd.ui.tests/plugin.properties
deleted file mode 100644
index 31fe23050..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.dtd.ui.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = DTD UI Tests
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java
deleted file mode 100644
index d85215c15..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUIPreferencesTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * The purpose of this test is to verify the validity of the HTML Source
- * editor preferences. Tests include setting/getting preferences.
- * 
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class DTDUIPreferencesTest extends TestCase {
-	/**
-	 * Tests existance of preference values when getting preference values
-	 * through Platform.getPreferencesService()
-	 */
-	public void testBundleGetPreferences() {
-		final String bundleName = "org.eclipse.wst.dtd.ui";
-
-		// need to start up bundle for default values to be loaded
-		Bundle bundle = Platform.getBundle(bundleName);
-		try {
-			if (bundle != null)
-				bundle.start();
-			else
-				fail("Get preference value failed because could not find bundle: " + bundleName);
-		} catch (BundleException e) {
-			fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
-		}
-	}
-
-	/**
-	 * Tests default values of preferences.
-	 * 
-	 * NOTE: Expected default values are hard-coded, so if default values do
-	 * get changed, assertions need to be updated as well
-	 */
-	public void testPluginGetDefaultPreferences() {
-		IPreferenceStore store = DTDUIPlugin.getDefault().getPreferenceStore();
-		assertNotNull("dtd preference store was null", store);
-	}
-
-	/**
-	 * Tests setting preference values by setting preference value to be a
-	 * certain value, then getting the preference value to verify it was set.
-	 */
-	public void testPluginSetPreferences() {
-		//ISSUE: this does NOT use SET
-		IPreferenceStore store = DTDUIPlugin.getDefault().getPreferenceStore();
-		assertNotNull("dtd preference store was null", store);
-	}
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java
deleted file mode 100644
index 956c9f151..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/DTDUITestSuite.java
+++ /dev/null
@@ -1,32 +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.dtd.ui.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.dtd.ui.tests.viewer.TestViewerConfigurationDTD;
-
-
-
-public class DTDUITestSuite extends TestSuite {
-	public static Test suite() {
-		return new DTDUITestSuite();
-	}
-
-	public DTDUITestSuite() {
-		super("DTD UI TestSuite");
-		addTest(new TestSuite(VerifyUIPlugin.class));
-		addTest(new TestSuite(DTDUIPreferencesTest.class));
-		addTest(new TestSuite(TestViewerConfigurationDTD.class));
-		addTest(new TestSuite(TestEditorConfigurationDTD.class));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/TestEditorConfigurationDTD.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/TestEditorConfigurationDTD.java
deleted file mode 100644
index 6af82638c..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/TestEditorConfigurationDTD.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.dtd.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD;
-import org.eclipse.wst.dtd.ui.views.contentoutline.DTDContentOutlineConfiguration;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-
-/**
- * Tests retrieving editor contributions for dtd content type
- */
-public class TestEditorConfigurationDTD extends TestCase {
-	public void testGetSourceViewerConfiguration() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForDTD.ContentTypeID_DTD);
-		assertNotNull("no source viewer configuration for " + ContentTypeIdForDTD.ContentTypeID_DTD, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected source viewer configuration for " + ContentTypeIdForDTD.ContentTypeID_DTD, o.getClass(), StructuredTextViewerConfigurationDTD.class);
-	}
-
-	public void testGetContentOutlineViewerConfiguration() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForDTD.ContentTypeID_DTD);
-		assertNotNull("no content outline configuration for " + ContentTypeIdForDTD.ContentTypeID_DTD, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected content outline configuration for " + ContentTypeIdForDTD.ContentTypeID_DTD, o.getClass(), DTDContentOutlineConfiguration.class);
-	}
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/VerifyUIPlugin.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/VerifyUIPlugin.java
deleted file mode 100644
index ba2daa76a..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/VerifyUIPlugin.java
+++ /dev/null
@@ -1,32 +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.dtd.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-
-
-public class VerifyUIPlugin extends TestCase {
-
-	public void testPluginExists() {
-		// TODO: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=81527
-		assertTrue(true);
-		Plugin plugin = null;
-		try {
-			plugin = DTDUIPlugin.getDefault();
-		}
-		catch (Exception e) {
-			plugin = null;
-		}
-		assertNotNull("editor plugin could not be instantiated", plugin);
-	}
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/DTDUITestsPlugin.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/DTDUITestsPlugin.java
deleted file mode 100644
index 14ed0caeb..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/DTDUITestsPlugin.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.wst.dtd.ui.tests.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class DTDUITestsPlugin extends Plugin {
-	// The shared instance.
-	private static DTDUITestsPlugin plugin;
-	// Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public DTDUITestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static DTDUITestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = DTDUITestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.dtd.ui.tests.internal.TestsPluginResources");
-		}
-		catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/Logger.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/Logger.java
deleted file mode 100644
index 5e84f45ae..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/internal/Logger.java
+++ /dev/null
@@ -1,144 +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.dtd.ui.tests.internal;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.dtd.ui.tests"; //$NON-NLS-1$
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * Adds message to log.
-	 * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message text to add to the log
-	 * @param exception exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * @param message text to print
-	 * @param category category of the message, to be compared with /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/TestViewerConfigurationDTD.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/TestViewerConfigurationDTD.java
deleted file mode 100644
index 92c246890..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/TestViewerConfigurationDTD.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.eclipse.wst.dtd.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.reconciler.IReconciler;
-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.PlatformUI;
-import org.eclipse.wst.dtd.core.text.IDTDPartitions;
-import org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD;
-import org.eclipse.wst.dtd.ui.tests.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-public class TestViewerConfigurationDTD extends TestCase {
-
-	private StructuredTextViewerConfigurationDTD fConfig = null;
-	private boolean fDisplayExists = true;
-	private StructuredTextViewer fViewer = null;
-	private boolean isSetup = false;
-
-	public TestViewerConfigurationDTD() {
-		super("TestViewerConfigurationDTD");
-	}
-
-	protected void setUp() throws Exception {
-
-		super.setUp();
-		if (!this.isSetup) {
-			setUpViewerConfiguration();
-			this.isSetup = true;
-		}
-	}
-
-	private void setUpViewerConfiguration() {
-
-		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
-			fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-			fConfig = new StructuredTextViewerConfigurationDTD();
-		}
-		else {
-			fDisplayExists = false;
-			Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
-		}
-	}
-
-	/**
-	 * Not necessary
-	 */
-	public void testGetAutoEditStrategies() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IDTDPartitions.DTD_DEFAULT);
-		assertNotNull(strategies);
-		assertTrue("there are no auto edit strategies", strategies.length > 0);
-	}
-
-	public void testGetConfiguredContentTypes() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		assertNotNull(configuredContentTypes);
-		assertTrue("there are no configured content types", configuredContentTypes.length > 1);
-	}
-
-	/**
-	 * Not necessary
-	 */
-	public void testGetContentAssistant() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IContentAssistant ca = fConfig.getContentAssistant(fViewer);
-		assertNotNull("there is no content assistant", ca);
-	}
-
-	/**
-	 * Not necessary
-	 */
-	public void testGetDoubleClickStrategy() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
-			if (strategy != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured double click strategies", false);
-	}
-
-	public void testGetLineStyleProviders() {
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
-			if(providers != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured line style providers", false);
-	}
-
-	/**
-	 * Not necessary
-	 */
-	public void testGetReconciler() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IReconciler r = fConfig.getReconciler(fViewer);
-		assertNotNull("Reconciler is null", r);
-	}
-}
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java b/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java
deleted file mode 100644
index ed9c3ce68..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/src/org/eclipse/wst/dtd/ui/tests/viewer/ViewerTestDTD.java
+++ /dev/null
@@ -1,493 +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.dtd.ui.tests.viewer;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.w3c.dom.Attr;
-
-public class ViewerTestDTD extends ViewPart {
-	/**
-	 * Sets the viewer's highlighting text range to the text range indicated
-	 * by the selected Nodes.
-	 */
-	protected class NodeRangeSelectionListener implements ISelectionChangedListener {
-		public void selectionChanged(SelectionChangedEvent event) {
-			if (!event.getSelection().isEmpty() && event.getSelection() instanceof IStructuredSelection) {
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				IndexedRegion startNode = (IndexedRegion) selection.getFirstElement();
-				IndexedRegion endNode = (IndexedRegion) selection.toArray()[selection.size() - 1];
-
-				if (startNode instanceof Attr)
-					startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
-				if (endNode instanceof Attr)
-					endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
-				int start = startNode.getStartOffset();
-				int end = endNode.getEndOffset();
-
-				fSourceViewer.resetVisibleRegion();
-				fSourceViewer.setVisibleRegion(start, end - start);
-				fSourceViewer.setSelectedRange(start, 0);
-			}
-			else {
-				fSourceViewer.resetVisibleRegion();
-			}
-		}
-	}
-
-	protected class NumberInputDialog extends Dialog {
-		public Text length;
-
-		int lengthValue;
-		public Text start;
-		int startValue;
-
-		public NumberInputDialog(Shell shell) {
-			super(shell);
-		}
-
-		protected Control createDialogArea(Composite parent) {
-			Composite composite = (Composite) super.createDialogArea(parent);
-			Composite container = new Composite(composite, SWT.NULL);
-			container.setLayoutData(new GridData(GridData.FILL_BOTH));
-			container.setLayout(new GridLayout(2, true));
-			setShellStyle(getShell().getStyle() | SWT.RESIZE);
-
-			Label label = new Label(container, SWT.NULL);
-			label.setText("Start");
-			label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			label = new Label(container, SWT.NULL);
-			label.setText("Length");
-			label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			start = new Text(container, SWT.BORDER);
-			startValue = fSourceViewer.getVisibleRegion().getOffset();
-			start.setText("" + startValue);
-			start.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			length = new Text(container, SWT.BORDER);
-			lengthValue = fSourceViewer.getVisibleRegion().getLength();
-			length.setText("" + lengthValue);
-			length.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			// start.addModifyListener(new ModifyListener() {
-			// public void modifyText(ModifyEvent e) {
-			// if (e.widget == start) {
-			// try {
-			// startValue = Integer.decode(start.getText()).intValue();
-			// }
-			// catch (NumberFormatException e2) {
-			// startValue = 0;
-			// }
-			// }
-			// }
-			// });
-			// length.addModifyListener(new ModifyListener() {
-			// public void modifyText(ModifyEvent e) {
-			// if (e.widget == length) {
-			// try {
-			// lengthValue = Integer.decode(length.getText()).intValue();
-			// }
-			// catch (NumberFormatException e2) {
-			// lengthValue = 0;
-			// }
-			// }
-			// }
-			// });
-
-			return composite;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-		 */
-		protected void okPressed() {
-			try {
-				startValue = Integer.decode(start.getText()).intValue();
-			}
-			catch (NumberFormatException e2) {
-				startValue = 0;
-			}
-			try {
-				lengthValue = Integer.decode(length.getText()).intValue();
-			}
-			catch (NumberFormatException e2) {
-				lengthValue = 0;
-			}
-			super.okPressed();
-		}
-	}
-
-	private final String DEFAULT_VIEWER_CONTENTS = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<HTML>\n	<HEAD>\n		<META http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">\n		<TITLE>place title here</TITLE>\n	</HEAD>\n	<BODY>\n		place content here	\n<script>\n\"text\";\n</SCRIPT>\n</BODY>\n</HTML>";
-	private StructuredTextViewerConfiguration fConfig = null;
-	private IContentOutlinePage fContentOutlinePage = null;
-	private ISelectionChangedListener fHighlightRangeListener = null;
-
-	private StructuredTextViewer fSourceViewer = null;
-
-
-	private final String SSE_EDITOR_FONT = "org.eclipse.wst.sse.ui.textfont";
-
-	protected void addActions(IContributionManager mgr) {
-		if (mgr != null) {
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "New HTML";
-				}
-
-				public void run() {
-					super.run();
-					BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
-						public void run() {
-							setupViewerForNew();
-							fSourceViewer.setEditable(true);
-						}
-					});
-				}
-			});
-			mgr.add(new Separator());
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Change Visibility";
-				}
-
-				public void run() {
-					super.run();
-					NumberInputDialog dlg = new NumberInputDialog(fSourceViewer.getControl().getShell());
-					int proceed = dlg.open();
-					if (proceed == Window.CANCEL)
-						return;
-					fSourceViewer.resetVisibleRegion();
-					fSourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Show All";
-				}
-
-				public void run() {
-					super.run();
-					fSourceViewer.resetVisibleRegion();
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Change Visibility in Editor";
-				}
-
-				public void run() {
-					super.run();
-					StructuredTextViewer sourceViewer = null;
-					IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-					if (part != null && part instanceof StructuredTextEditor) {
-						sourceViewer = ((StructuredTextEditor) part).getTextViewer();
-					}
-					if (sourceViewer != null) {
-						NumberInputDialog dlg = new NumberInputDialog(sourceViewer.getControl().getShell());
-						int proceed = dlg.open();
-						if (proceed == Window.CANCEL)
-							return;
-						sourceViewer.resetVisibleRegion();
-						sourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
-					}
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Show All in Editor";
-				}
-
-				public void run() {
-					super.run();
-					StructuredTextViewer sourceViewer = null;
-					IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-					if (part != null && part instanceof StructuredTextEditor) {
-						sourceViewer = ((StructuredTextEditor) part).getTextViewer();
-					}
-					if (sourceViewer != null) {
-						sourceViewer.resetVisibleRegion();
-					}
-				}
-			});
-			mgr.add(new Separator());
-			// no longer able to set fInput to NULL
-			// mgr.add(new Action() {
-			// public String getText() {
-			// return getToolTipText();
-			// }
-			//
-			// public String getToolTipText() {
-			// return "Set Input to NULL";
-			// }
-			// public void run() {
-			// super.run();
-			// viewer.setInput(null);
-			// }
-			// });
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input from Active Editor";
-				}
-
-				public void run() {
-					super.run();
-					ITextEditor textEditor = getActiveEditor();
-					if (textEditor != null) {
-						setupViewerForEditor(textEditor);
-						fSourceViewer.setEditable(true);
-					}
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input and Follow Selection";
-				}
-
-				public void run() {
-					super.run();
-					followSelection();
-					fSourceViewer.setEditable(true);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input and Follow Selection As ReadOnly";
-				}
-
-				public void run() {
-					super.run();
-					followSelection();
-					fSourceViewer.setEditable(false);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Stop Following Selection";
-				}
-
-				public void run() {
-					super.run();
-					stopFollowSelection();
-				}
-			});
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		IContributionManager mgr = getViewSite().getActionBars().getMenuManager();
-		addActions(mgr);
-
-		// create source viewer & its content type-specific viewer
-		// configuration
-		fSourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-		fConfig = new StructuredTextViewerConfigurationDTD();
-
-		// set up the viewer with a document & viewer config
-		setupViewerForNew();
-
-		setupViewerPreferences();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		stopFollowSelection();
-		fSourceViewer.unconfigure();
-	}
-
-	/**
-	 * Hooks up the viewer to follow the fSelection made in the active editor
-	 */
-	private void followSelection() {
-		ITextEditor editor = getActiveEditor();
-		if (editor != null) {
-			setupViewerForEditor(editor);
-			if (fHighlightRangeListener == null)
-				fHighlightRangeListener = new NodeRangeSelectionListener();
-
-			fContentOutlinePage = ((IContentOutlinePage) editor.getAdapter(IContentOutlinePage.class));
-			if (fContentOutlinePage != null) {
-				fContentOutlinePage.addSelectionChangedListener(fHighlightRangeListener);
-
-				if (!fContentOutlinePage.getSelection().isEmpty() && fContentOutlinePage.getSelection() instanceof IStructuredSelection) {
-					fSourceViewer.resetVisibleRegion();
-
-					Object[] nodes = ((IStructuredSelection) fContentOutlinePage.getSelection()).toArray();
-					IndexedRegion startNode = (IndexedRegion) nodes[0];
-					IndexedRegion endNode = (IndexedRegion) nodes[nodes.length - 1];
-
-					int start = startNode.getStartOffset();
-					int end = endNode.getEndOffset();
-
-					fSourceViewer.setVisibleRegion(start, end - start);
-					fSourceViewer.setSelectedRange(start, 0);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Returns the current active text editor if possible
-	 * 
-	 * @return ITextEditor
-	 */
-	private ITextEditor getActiveEditor() {
-		ITextEditor editor = null;
-		IEditorPart editorPart = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-		if (editorPart instanceof ITextEditor)
-			editor = (ITextEditor) editorPart;
-		if (editor == null && editorPart != null)
-			editor = (ITextEditor) editorPart.getAdapter(ITextEditor.class);
-		return editor;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
-	 */
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		if (fSourceViewer.getControl() != null && !fSourceViewer.getControl().isDisposed())
-			fSourceViewer.getControl().setFocus();
-	}
-
-	/**
-	 * Sets up the viewer with the same document/fInput as the given editor
-	 * 
-	 * @param ITextEditor
-	 *            editor - the editor to use *cannot to be null*
-	 */
-	private void setupViewerForEditor(ITextEditor editor) {
-		stopFollowSelection(); // if was following fSelection, stop
-		IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
-		fSourceViewer.setDocument(doc);
-
-		// need to reconfigure after set document just so highlighter works
-		fSourceViewer.configure(new StructuredTextViewerConfigurationDTD());
-	}
-
-	/**
-	 * Set up source viewer with a new document & configure it
-	 */
-	private void setupViewerForNew() {
-		stopFollowSelection(); // if was following fSelection, stop
-
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IDocument doc = modelManager.createStructuredDocumentFor(ContentTypeIdForDTD.ContentTypeID_DTD);
-		doc.set(DEFAULT_VIEWER_CONTENTS);
-
-		fSourceViewer.setDocument(doc);
-		// need to reconfigure after set document just so highlighter works
-		fSourceViewer.configure(fConfig);
-	}
-
-	/**
-	 * Set up source viewer with any additional preferences it should have Ex:
-	 * font, tab width
-	 */
-	private void setupViewerPreferences() {
-		fSourceViewer.getTextWidget().setFont(JFaceResources.getFont(SSE_EDITOR_FONT));
-	}
-
-	/**
-	 * Cease following the fSelection made in the editor
-	 */
-	private void stopFollowSelection() {
-		if (fContentOutlinePage != null) {
-			fContentOutlinePage.removeSelectionChangedListener(fHighlightRangeListener);
-			fSourceViewer.resetVisibleRegion();
-			fContentOutlinePage = null;
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.dtd.ui.tests/test.xml b/tests/org.eclipse.wst.dtd.ui.tests/test.xml
deleted file mode 100644
index 9cbf4b6ca..000000000
--- a/tests/org.eclipse.wst.dtd.ui.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-
-	<property
-		name="plugin-name"
-		value="org.eclipse.wst.dtd.ui.tests" />
-    <property
-        name="classname"
-        value="org.eclipse.wst.dtd.ui.tests.DTDUITestSuite" />
-    <property
-        name="testType"
-        value="ui-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/.classpath b/tests/org.eclipse.wst.html.core.tests/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.html.core.tests/.cvsignore b/tests/org.eclipse.wst.html.core.tests/.cvsignore
deleted file mode 100644
index f90a72f76..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-bin.project
-build.xml
-dev.properties
-htmlcoretests.jar
-temp.folder
diff --git a/tests/org.eclipse.wst.html.core.tests/.project b/tests/org.eclipse.wst.html.core.tests/.project
deleted file mode 100644
index 25bb24033..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.html.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.html.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index df9584eb1..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.wst.html.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 86d9a6b54..000000000
--- a/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.html.core.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: htmlcoretests.jar
-Bundle-Activator: org.eclipse.wst.html.core.tests.HTMLCoreTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.html.core.tests,
- org.eclipse.wst.html.core.tests.misc,
- org.eclipse.wst.html.core.tests.model,
- org.eclipse.wst.html.core.tests.parser,
- org.eclipse.wst.html.core.tests.parser.css,
- org.eclipse.wst.html.core.tests.text,
- org.eclipse.wst.html.core.tests.text.testfiles.html,
- org.eclipse.wst.html.core.tests.utils
-Require-Bundle: org.junit,
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.core.runtime,
- org.eclipse.wst.css.core,
- com.ibm.icu,
- org.eclipse.core.resources
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest.txt
deleted file mode 100644
index b67db1821..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.AttrTest
-Source :
-<a href="<%=c%>">a</a>
-
-
-StructuredDocument Regions :
-[0, 9] (<a href=")
-[9, 10] (<)
-[10, 12] (%=)
-[12, 13] (c)
-[13, 14] (%)
-[14, 18] (>">a)
-[18, 22] (</a>)
-
-Tree :
-#document
---a/a@[0, 9] (<a href&#61;")@[18, 22] (</a>)
-----#text(<%&#61;c%>">a)@{[9, 10] (<),[10, 12] (%&#61;),[12, 13] (c),[13, 14] (%),[14, 18] (>">a)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest2.txt
deleted file mode 100644
index 7962c6149..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.AttrTest2.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.AttrTest2
-Source :
-<a b="c" d="e">f</a>
-
-
-StructuredDocument Regions :
-[0, 15] (<a b="c" d="e">)
-[15, 16] (f)
-[16, 20] (</a>)
-
-Tree :
-#document
---a/a@[0, 15] (<a b&#61;"c" d&#61;"e">)@[16, 20] (</a>)
-----#text(f)@[15, 16] (f)
-
-b.name=x:b
-b.value=c
-a b=null
-a x:b=c
-Source :
-<a x:b="c" d="e">f</a>
-
-
-StructuredDocument Regions :
-[0, 17] (<a x:b="c" d="e">)
-[17, 18] (f)
-[18, 22] (</a>)
-
-Tree :
-#document
---a/a@[0, 17] (<a x:b&#61;"c" d&#61;"e">)@[18, 22] (</a>)
-----#text(f)@[17, 18] (f)
-
-Source :
-<a x:b="c" y:d="e">f</a>
-
-
-StructuredDocument Regions :
-[0, 19] (<a x:b="c" y:d="e">)
-[19, 20] (f)
-[20, 24] (</a>)
-
-Tree :
-#document
---a/a@[0, 19] (<a x:b&#61;"c" y:d&#61;"e">)@[20, 24] (</a>)
-----#text(f)@[19, 20] (f)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest.txt
deleted file mode 100644
index 8deb57191..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.CDATASectionTest
-Source :
-<a><![CDATA[contentOfCDATASection]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 36] (<![CDATA[contentOfCDATASection]]>)
-[36, 40] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[36, 40] (</a>)
-----#cdata-section(contentOfCDATASection)@[3, 36] (<![CDATA[contentOfCDATASection]]>)
-
-contentOfCDATASection
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest2.txt
deleted file mode 100644
index 8ef86ab70..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest2.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.CDATASectionTest2
-Source :
-<a><![CDATA[contentOfCDATASection]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 36] (<![CDATA[contentOfCDATASection]]>)
-[36, 40] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[36, 40] (</a>)
-----#cdata-section(contentOfCDATASection)@[3, 36] (<![CDATA[contentOfCDATASection]]>)
-
-contentOfCDATASection
-Source :
-<a><![CDATA[new content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 26] (<![CDATA[new content]]>)
-[26, 30] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[26, 30] (</a>)
-----#cdata-section(new content)@[3, 26] (<![CDATA[new content]]>)
-
-new content
-Source :
-<a><![CDATA[new content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 26] (<![CDATA[new content]]>)
-[26, 30] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[26, 30] (</a>)
-----#cdata-section(new content)@[3, 26] (<![CDATA[new content]]>)
-
-new content
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest3.txt
deleted file mode 100644
index c7cc12171..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.CDATASectionTest3.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.CDATASectionTest3
-Source :
-<a><![CDATA[contentOfCDATASection]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 36] (<![CDATA[contentOfCDATASection]]>)
-[36, 40] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[36, 40] (</a>)
-----#cdata-section(contentOfCDATASection)@[3, 36] (<![CDATA[contentOfCDATASection]]>)
-
-contentOfCDATASection
-Source :
-<a><![CDATA[new < content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 28] (<![CDATA[new < content]]>)
-[28, 32] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[28, 32] (</a>)
-----#cdata-section(new < content)@[3, 28] (<![CDATA[new < content]]>)
-
-new < content
-Source :
-<a><![CDATA[new > content]]></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 28] (<![CDATA[new > content]]>)
-[28, 32] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[28, 32] (</a>)
-----#cdata-section(new > content)@[3, 28] (<![CDATA[new > content]]>)
-
-new > content
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.DocTypeTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.DocTypeTest.txt
deleted file mode 100644
index 2cca97b7c..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.DocTypeTest.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.DocTypeTest
-Source :
-<!DOCTYPE HTML><html></html>
-
-
-StructuredDocument Regions :
-[0, 15] (<!DOCTYPE HTML>)
-[15, 21] (<html>)
-[21, 28] (</html>)
-
-Tree :
-#document
---HTML(null)(null)@[0, 15] (<!DOCTYPE HTML>)
---html/html@[15, 21] (<html>)@[21, 28] (</html>)
-
-Source :
-<!DOCTYPE HTML SYSTEM "sytem"><html></html>
-
-
-StructuredDocument Regions :
-[0, 30] (<!DOCTYPE HTML SYSTEM "sytem">)
-[30, 36] (<html>)
-[36, 43] (</html>)
-
-Tree :
-#document
---HTML(null)(sytem)@[0, 30] (<!DOCTYPE HTML SYSTEM "sytem">)
---html/html@[30, 36] (<html>)@[36, 43] (</html>)
-
-Source :
-<!DOCTYPE HTML PUBLIC "public" "sytem"><html></html>
-
-
-StructuredDocument Regions :
-[0, 39] (<!DOCTYPE HTML PUBLIC "public" "sytem">)
-[39, 45] (<html>)
-[45, 52] (</html>)
-
-Tree :
-#document
---HTML(public)(sytem)@[0, 39] (<!DOCTYPE HTML PUBLIC "public" "sytem">)
---html/html@[39, 45] (<html>)@[45, 52] (</html>)
-
-Source :
- <!DOCTYPE HTML PUBLIC "public" "sytem"><html></html>
-
-
-StructuredDocument Regions :
-[0, 1] ( )
-[1, 40] (<!DOCTYPE HTML PUBLIC "public" "sytem">)
-[40, 46] (<html>)
-[46, 53] (</html>)
-
-Tree :
-#document
---#text( )@[0, 1] ( )
---HTML(public)(sytem)@[1, 40] (<!DOCTYPE HTML PUBLIC "public" "sytem">)
---html/html@[40, 46] (<html>)@[46, 53] (</html>)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest.txt
deleted file mode 100644
index ffcd82611..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ElementTest
-Source :
-<a><b e="f" c="d"><g /><h /></b></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 18] (<b e="f" c="d">)
-[18, 23] (<g />)
-[23, 28] (<h />)
-[28, 32] (</b>)
-[32, 36] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[32, 36] (</a>)
-----b/b@[3, 18] (<b e&#61;"f" c&#61;"d">)@[28, 32] (</b>)
-------g/@[18, 23] (<g />)
-------h/@[23, 28] (<h />)
-
-Source :
-<a><i e="f" c="d"><g /><h /></i></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 18] (<i e="f" c="d">)
-[18, 23] (<g />)
-[23, 28] (<h />)
-[28, 32] (</i>)
-[32, 36] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[32, 36] (</a>)
-----i/i@[3, 18] (<i e&#61;"f" c&#61;"d">)@[28, 32] (</i>)
-------g/@[18, 23] (<g />)
-------h/@[23, 28] (<h />)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest2.txt
deleted file mode 100644
index 9d4609176..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest2.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ElementTest2
-Source :
-<a><b>c</b></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 6] (<b>)
-[6, 7] (c)
-[7, 11] (</b>)
-[11, 15] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[11, 15] (</a>)
-----b/b@[3, 6] (<b>)@[7, 11] (</b>)
-------#text(c)@[6, 7] (c)
-
-a.tagName=x:a
-Source :
-<x:a><b>c</b></x:a>
-
-
-StructuredDocument Regions :
-[0, 5] (<x:a>)
-[5, 8] (<b>)
-[8, 9] (c)
-[9, 13] (</b>)
-[13, 19] (</x:a>)
-
-Tree :
-#document
---x:a/x:a@[0, 5] (<x:a>)@[13, 19] (</x:a>)
-----b/b@[5, 8] (<b>)@[9, 13] (</b>)
-------#text(c)@[8, 9] (c)
-
-Source :
-<x:a><y:b>c</y:b></x:a>
-
-
-StructuredDocument Regions :
-[0, 5] (<x:a>)
-[5, 10] (<y:b>)
-[10, 11] (c)
-[11, 17] (</y:b>)
-[17, 23] (</x:a>)
-
-Tree :
-#document
---x:a/x:a@[0, 5] (<x:a>)@[17, 23] (</x:a>)
-----y:b/y:b@[5, 10] (<y:b>)@[11, 17] (</y:b>)
-------#text(c)@[10, 11] (c)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest3.txt
deleted file mode 100644
index b5dabf405..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ElementTest3.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ElementTest3
-Source :
-<x:a><b>c</b></x:a>
-
-
-StructuredDocument Regions :
-[0, 5] (<x:a>)
-[5, 8] (<b>)
-[8, 9] (c)
-[9, 13] (</b>)
-[13, 19] (</x:a>)
-
-Tree :
-#document
---x:a/x:a@[0, 5] (<x:a>)@[13, 19] (</x:a>)
-----b/b@[5, 8] (<b>)@[9, 13] (</b>)
-------#text(c)@[8, 9] (c)
-
-a.tagName=a
-Source :
-<a><b>c</b></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 6] (<b>)
-[6, 7] (c)
-[7, 11] (</b>)
-[11, 15] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[11, 15] (</a>)
-----b/b@[3, 6] (<b>)@[7, 11] (</b>)
-------#text(c)@[6, 7] (c)
-
-a.tagName=y:a
-Source :
-<y:a><b>c</b></y:a>
-
-
-StructuredDocument Regions :
-[0, 5] (<y:a>)
-[5, 8] (<b>)
-[8, 9] (c)
-[9, 13] (</b>)
-[13, 19] (</y:a>)
-
-Tree :
-#document
---y:a/y:a@[0, 5] (<y:a>)@[13, 19] (</y:a>)
-----b/b@[5, 8] (<b>)@[9, 13] (</b>)
-------#text(c)@[8, 9] (c)
-
-Source :
-<y:a><b>c</b></y:a>
-
-
-StructuredDocument Regions :
-[0, 5] (<y:a>)
-[5, 8] (<b>)
-[8, 9] (c)
-[9, 13] (</b>)
-[13, 19] (</y:a>)
-
-Tree :
-#document
---y:a/y:a@[0, 5] (<y:a>)@[13, 19] (</y:a>)
-----b/b@[5, 8] (<b>)@[9, 13] (</b>)
-------#text(c)@[8, 9] (c)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest.txt
deleted file mode 100644
index 5ecafe93b..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EmptyTextTest
-Source :
-<p>a<br></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (<br>)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(a)@[3, 4] (a)
-----br@[4, 8] (<br>)
-----#text()
-
-Source :
-<p>a<br></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (<br>)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(a)@[3, 4] (a)
-----br@[4, 8] (<br>)
-----#text()
-----#text()
-
-Source :
-<p>a<br>b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (<br>)
-[8, 9] (b)
-[9, 13] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[9, 13] (</p>)
-----#text(a)@[3, 4] (a)
-----br@[4, 8] (<br>)
-----#text(b)@[8, 9] (b)
-----#text()
-
-Source :
-<p>a<br>b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (<br>)
-[8, 9] (b)
-[9, 13] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[9, 13] (</p>)
-----#text(a)@[3, 4] (a)
-----br@[4, 8] (<br>)
-----#text(b)@[8, 9] (b)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest2.txt
deleted file mode 100644
index 5386efb99..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest2.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EmptyTextTest2
-Source :
-<p></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[3, 7] (</p>)
-----#text()
-
-Source :
-<p>a</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[4, 8] (</p>)
-----#text(a)@[3, 4] (a)
-
-Source :
-<p></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[3, 7] (</p>)
-----#text()
-
-Source :
-<p><b></b></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 6] (<b>)
-[6, 10] (</b>)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----b/b@[3, 6] (<b>)@[6, 10] (</b>)
-------#text()
-
-Source :
-<p><b>a</b></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 6] (<b>)
-[6, 7] (a)
-[7, 11] (</b>)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----b/b@[3, 6] (<b>)@[7, 11] (</b>)
-------#text(a)@[6, 7] (a)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest3.txt
deleted file mode 100644
index 0e65eff08..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EmptyTextTest3.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EmptyTextTest3
-Source :
-
-
-
-StructuredDocument Regions :
-
-Tree :
-#document
---#text()
-
-Source :
-<a></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[3, 7] (</a>)
---#text()
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest.txt
deleted file mode 100644
index 4a72f84b2..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest
-Source :
-<p></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[3, 7] (</p>)
-
-Source :
-<p>&amp;gt;</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 8] (&amp;)
-[8, 11] (gt;)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(&gt;)@{[3, 8] (&amp;),[8, 11] (gt;)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest2.txt
deleted file mode 100644
index 7172ef427..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest2.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest2
-Source :
-<p>a</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[4, 8] (</p>)
-----#text(a)@[3, 4] (a)
-
-Source :
-<p>a&amp;gt;</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&amp;)
-[9, 12] (gt;)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(a&gt;)@{[3, 4] (a),[4, 9] (&amp;),[9, 12] (gt;)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest3.txt
deleted file mode 100644
index 52cb3c90d..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest3.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest3
-Source :
-<p>a</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 8] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[4, 8] (</p>)
-----#text(a)@[3, 4] (a)
-
-Source :
-<p>ab</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ab)
-[5, 9] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[5, 9] (</p>)
-----#text(ab)@[3, 5] (ab)
-
-Source :
-<p>ab&amp;</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ab)
-[5, 10] (&amp;)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----#text(ab&)@{[3, 5] (ab),[5, 10] (&amp;)}
-
-Source :
-<p>ab&amp;c</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ab)
-[5, 10] (&amp;)
-[10, 11] (c)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(ab&c)@{[3, 5] (ab),[5, 10] (&amp;),[10, 11] (c)}
-
-Source :
-<p>dab&amp;c</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 6] (dab)
-[6, 11] (&amp;)
-[11, 12] (c)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(dab&c)@{[3, 6] (dab),[6, 11] (&amp;),[11, 12] (c)}
-
-Source :
-<p>dab&amp;ce</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 6] (dab)
-[6, 11] (&amp;)
-[11, 13] (ce)
-[13, 17] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[13, 17] (</p>)
-----#text(dab&ce)@{[3, 6] (dab),[6, 11] (&amp;),[11, 13] (ce)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest4.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest4.txt
deleted file mode 100644
index 0ce80f936..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest4.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest4
-Source :
-<p>a&amp;b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&amp;)
-[9, 10] (b)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----#text(a&b)@{[3, 4] (a),[4, 9] (&amp;),[9, 10] (b)}
-
-Source :
-<p>a&amp;b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&amp;)
-[9, 10] (b)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----#text()
-----#text(a&b)@{[3, 4] (a),[4, 9] (&amp;),[9, 10] (b)}
-
-Source :
-<p>ca&amp;b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ca)
-[5, 10] (&amp;)
-[10, 11] (b)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(c)@[3,4]([3, 5] (ca))
-----#text(a&b)@{[4,5]([3, 5] (ca)),[5, 10] (&amp;),[10, 11] (b)}
-
-Source :
-<p>ca&amp;ba&amp;b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ca)
-[5, 10] (&amp;)
-[10, 12] (ba)
-[12, 17] (&amp;)
-[17, 18] (b)
-[18, 22] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[18, 22] (</p>)
-----#text(ca&b)@{[3, 5] (ca),[5, 10] (&amp;),[10,11]([10, 12] (ba))}
-----#text(a&b)@{[11,12]([10, 12] (ba)),[12, 17] (&amp;),[17, 18] (b)}
-
-Source :
-<p>ca&amp;b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ca)
-[5, 10] (&amp;)
-[10, 11] (b)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(ca&b)@{[3, 5] (ca),[5, 10] (&amp;),[10, 11] (b)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest5.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest5.txt
deleted file mode 100644
index 78eb8c47f..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest5.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest5
-Source :
-<p>a&amp;b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&amp;)
-[9, 10] (b)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----#text(a&b)@{[3, 4] (a),[4, 9] (&amp;),[9, 10] (b)}
-
-Source :
-<p>a&amp;ba&amp;b</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&amp;)
-[9, 11] (ba)
-[11, 16] (&amp;)
-[16, 17] (b)
-[17, 21] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[17, 21] (</p>)
-----#text(a&b)@{[3, 4] (a),[4, 9] (&amp;),[9,10]([9, 11] (ba))}
-----#text(a&b)@{[10,11]([9, 11] (ba)),[11, 16] (&amp;),[16, 17] (b)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest6.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest6.txt
deleted file mode 100644
index 61315f34c..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest6.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest6
-Source :
-<p>a&amp;</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&amp;)
-[9, 13] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[9, 13] (</p>)
-----#text(a&)@{[3, 4] (a),[4, 9] (&amp;)}
-
-Source :
-<p>a&amp;a&amp;</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 4] (a)
-[4, 9] (&amp;)
-[9, 10] (a)
-[10, 15] (&amp;)
-[15, 19] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[15, 19] (</p>)
-----#text(a&)@{[3, 4] (a),[4, 9] (&amp;)}
-----#text(a&)@{[9, 10] (a),[10, 15] (&amp;)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest7.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest7.txt
deleted file mode 100644
index 025d98272..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest7.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest7
-Source :
-<a>a&#65;&#x41;&unk;&unk&unk</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (a)
-[4, 9] (&#65;)
-[9, 15] (&#x41;)
-[15, 20] (&unk;)
-[20, 24] (&unk)
-[24, 28] (&unk)
-[28, 32] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[28, 32] (</a>)
-----#text(aAA)@{[3, 4] (a),[4, 9] (&#65;),[9, 15] (&#x41;)}
-----unk
-----#text(&unk&unk)@{[20, 24] (&unk),[24, 28] (&unk)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest8.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest8.txt
deleted file mode 100644
index 3decb1b84..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest8.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest8
-Source :
-&ibm;&rtp;
-
-
-StructuredDocument Regions :
-[0, 5] (&ibm;)
-[5, 10] (&rtp;)
-
-Tree :
-#document
---ibm
---rtp
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest9.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest9.txt
deleted file mode 100644
index 0802e3a96..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.EntityTest9.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.EntityTest9
-Source :
-&lt;
-
-
-StructuredDocument Regions :
-[0, 4] (&lt;)
-
-Tree :
-#document
---#text(<)@[0, 4] (&lt;)
-
-Source :
-&lt;&gt
-
-
-StructuredDocument Regions :
-[0, 4] (&lt;)
-[4, 7] (&gt)
-
-Tree :
-#document
---#text(<&gt)@{[0, 4] (&lt;),[4, 7] (&gt)}
-
-Source :
-&lt;&gt;
-
-
-StructuredDocument Regions :
-[0, 4] (&lt;)
-[4, 8] (&gt;)
-
-Tree :
-#document
---#text(<>)@{[0, 4] (&lt;),[4, 8] (&gt;)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.PITest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.PITest.txt
deleted file mode 100644
index 36aea6a5b..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.PITest.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.PITest
-Source :
-<a><?echo $PHP_SELF?></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 21] (<?echo $PHP_SELF?>)
-[21, 25] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[21, 25] (</a>)
-----echo($PHP_SELF)
-
-target(echo) data ($PHP_SELF)
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest.txt
deleted file mode 100644
index a49679729..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest.txt
+++ /dev/null
@@ -1,225 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ParserTest
-Source :
-<P><B></B><B></B></P><P></P>
-
-
-StructuredDocument Regions :
-[0, 3] (<P>)
-[3, 6] (<B>)
-[6, 10] (</B>)
-[10, 13] (<B>)
-[13, 17] (</B>)
-[17, 21] (</P>)
-[21, 24] (<P>)
-[24, 28] (</P>)
-
-Tree :
-#document
---P/P@[0, 3] (<P>)@[17, 21] (</P>)
-----B/B@[3, 6] (<B>)@[6, 10] (</B>)
-----B/B@[10, 13] (<B>)@[13, 17] (</B>)
---P/P@[21, 24] (<P>)@[24, 28] (</P>)
-
-Source :
-a<P><B></B><B></B></P><P></P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 7] (<B>)
-[7, 11] (</B>)
-[11, 14] (<B>)
-[14, 18] (</B>)
-[18, 22] (</P>)
-[22, 25] (<P>)
-[25, 29] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[18, 22] (</P>)
-----B/B@[4, 7] (<B>)@[7, 11] (</B>)
-----B/B@[11, 14] (<B>)@[14, 18] (</B>)
---P/P@[22, 25] (<P>)@[25, 29] (</P>)
-
-Source :
-a<P>b<B></B><B></B></P><P></P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 15] (<B>)
-[15, 19] (</B>)
-[19, 23] (</P>)
-[23, 26] (<P>)
-[26, 30] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[19, 23] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----B/B@[12, 15] (<B>)@[15, 19] (</B>)
---P/P@[23, 26] (<P>)@[26, 30] (</P>)
-
-Source :
-a<P>b<B></B>c<B></B></P><P></P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 13] (c)
-[13, 16] (<B>)
-[16, 20] (</B>)
-[20, 24] (</P>)
-[24, 27] (<P>)
-[27, 31] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[20, 24] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----#text(c)@[12, 13] (c)
-----B/B@[13, 16] (<B>)@[16, 20] (</B>)
---P/P@[24, 27] (<P>)@[27, 31] (</P>)
-
-Source :
-a<P>b<B></B>c<B></B>d</P><P></P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 13] (c)
-[13, 16] (<B>)
-[16, 20] (</B>)
-[20, 21] (d)
-[21, 25] (</P>)
-[25, 28] (<P>)
-[28, 32] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[21, 25] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----#text(c)@[12, 13] (c)
-----B/B@[13, 16] (<B>)@[16, 20] (</B>)
-----#text(d)@[20, 21] (d)
---P/P@[25, 28] (<P>)@[28, 32] (</P>)
-
-Source :
-a<P>b<B></B>c<B></B>d</P>e<P></P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 13] (c)
-[13, 16] (<B>)
-[16, 20] (</B>)
-[20, 21] (d)
-[21, 25] (</P>)
-[25, 26] (e)
-[26, 29] (<P>)
-[29, 33] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[21, 25] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----#text(c)@[12, 13] (c)
-----B/B@[13, 16] (<B>)@[16, 20] (</B>)
-----#text(d)@[20, 21] (d)
---#text(e)@[25, 26] (e)
---P/P@[26, 29] (<P>)@[29, 33] (</P>)
-
-Source :
-a<P>b<B></B>c<B></B>d</P>e<P>f</P>
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 13] (c)
-[13, 16] (<B>)
-[16, 20] (</B>)
-[20, 21] (d)
-[21, 25] (</P>)
-[25, 26] (e)
-[26, 29] (<P>)
-[29, 30] (f)
-[30, 34] (</P>)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[21, 25] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----#text(c)@[12, 13] (c)
-----B/B@[13, 16] (<B>)@[16, 20] (</B>)
-----#text(d)@[20, 21] (d)
---#text(e)@[25, 26] (e)
---P/P@[26, 29] (<P>)@[30, 34] (</P>)
-----#text(f)@[29, 30] (f)
-
-Source :
-a<P>b<B></B>c<B></B>d</P>e<P>f</P>g
-
-
-StructuredDocument Regions :
-[0, 1] (a)
-[1, 4] (<P>)
-[4, 5] (b)
-[5, 8] (<B>)
-[8, 12] (</B>)
-[12, 13] (c)
-[13, 16] (<B>)
-[16, 20] (</B>)
-[20, 21] (d)
-[21, 25] (</P>)
-[25, 26] (e)
-[26, 29] (<P>)
-[29, 30] (f)
-[30, 34] (</P>)
-[34, 35] (g)
-
-Tree :
-#document
---#text(a)@[0, 1] (a)
---P/P@[1, 4] (<P>)@[21, 25] (</P>)
-----#text(b)@[4, 5] (b)
-----B/B@[5, 8] (<B>)@[8, 12] (</B>)
-----#text(c)@[12, 13] (c)
-----B/B@[13, 16] (<B>)@[16, 20] (</B>)
-----#text(d)@[20, 21] (d)
---#text(e)@[25, 26] (e)
---P/P@[26, 29] (<P>)@[30, 34] (</P>)
-----#text(f)@[29, 30] (f)
---#text(g)@[34, 35] (g)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest2.txt
deleted file mode 100644
index 83990a68d..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest2.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ParserTest2
-Source :
-<a b=""  c="c">
-
-
-StructuredDocument Regions :
-[0, 15] (<a b=""  c="c">)
-
-Tree :
-#document
---a@[0, 15] (<a b&#61;""  c&#61;"c">)
-
-b=[]
-c=[c]
-Source :
-<a b="" d c="c">
-
-
-StructuredDocument Regions :
-[0, 16] (<a b="" d c="c">)
-
-Tree :
-#document
---a@[0, 16] (<a b&#61;"" d c&#61;"c">)
-
-b=[]
-d=[]
-c=[c]
-Source :
-<a b=""  c="c">
-
-
-StructuredDocument Regions :
-[0, 15] (<a b=""  c="c">)
-
-Tree :
-#document
---a@[0, 15] (<a b&#61;""  c&#61;"c">)
-
-b=[]
-c=[c]
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest3.txt
deleted file mode 100644
index 4338afc1d..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest3.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ParserTest3
-Source :
-<a b  >
-
-
-StructuredDocument Regions :
-[0, 7] (<a b  >)
-
-Tree :
-#document
---a@[0, 7] (<a b  >)
-
-b=[]
-org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent
-Source :
-<a b >
-
-
-StructuredDocument Regions :
-[0, 6] (<a b >)
-
-Tree :
-#document
---a@[0, 6] (<a b >)
-
-b=[]
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest4.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest4.txt
deleted file mode 100644
index 8c32ce2ef..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.ParserTest4.txt
+++ /dev/null
@@ -1,243 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.ParserTest4
-Source :
-<a>
-
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 5] (
-
-)
-[5, 6] (<)
-[6, 8] (% )
-[8, 10] (a )
-[10, 11] (%)
-[11, 13] (>
-)
-[13, 14] (<)
-[14, 16] (% )
-[16, 18] (b )
-[18, 19] (%)
-[19, 21] (>
-)
-[21, 25] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[21, 25] (</a>)
-----#text(\n\n<% a %>\n<% b %>\n)@{[3, 5] (\n\n),[5, 6] (<),[6, 8] (% ),[8, 10] (a ),[10, 11] (%),[11, 13] (>\n),[13, 14] (<),[14, 16] (% ),[16, 18] (b ),[18, 19] (%),[19, 21] (>\n)}
-
-Source :
-<a>
-<
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 5] (<)
-[5, 6] (
-)
-[6, 7] (<)
-[7, 9] (% )
-[9, 11] (a )
-[11, 12] (%)
-[12, 14] (>
-)
-[14, 15] (<)
-[15, 17] (% )
-[17, 19] (b )
-[19, 20] (%)
-[20, 22] (>
-)
-[22, 26] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[22, 26] (</a>)
-----#text(\n<\n<% a %>\n<% b %>\n)@{[3, 4] (\n),[4, 5] (<),[5, 6] (\n),[6, 7] (<),[7, 9] (% ),[9, 11] (a ),[11, 12] (%),[12, 14] (>\n),[14, 15] (<),[15, 17] (% ),[17, 19] (b ),[19, 20] (%),[20, 22] (>\n)}
-
-Source :
-<a>
-<b
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 7] (<b
-)
-[7, 8] (<)
-[8, 10] (% )
-[10, 12] (a )
-[12, 13] (%)
-[13, 15] (>
-)
-[15, 16] (<)
-[16, 18] (% )
-[18, 20] (b )
-[20, 21] (%)
-[21, 23] (>
-)
-[23, 27] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[23, 27] (</a>)
-----#text(\n)@[3, 4] (\n)
-----b@[4, 7] (<b\n)
-------#text(<% a %>\n<% b %>\n)@{[7, 8] (<),[8, 10] (% ),[10, 12] (a ),[12, 13] (%),[13, 15] (>\n),[15, 16] (<),[16, 18] (% ),[18, 20] (b ),[20, 21] (%),[21, 23] (>\n)}
-
-Source :
-<a>
-<bc
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 8] (<bc
-)
-[8, 9] (<)
-[9, 11] (% )
-[11, 13] (a )
-[13, 14] (%)
-[14, 16] (>
-)
-[16, 17] (<)
-[17, 19] (% )
-[19, 21] (b )
-[21, 22] (%)
-[22, 24] (>
-)
-[24, 28] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[24, 28] (</a>)
-----#text(\n)@[3, 4] (\n)
-----bc@[4, 8] (<bc\n)
-------#text(<% a %>\n<% b %>\n)@{[8, 9] (<),[9, 11] (% ),[11, 13] (a ),[13, 14] (%),[14, 16] (>\n),[16, 17] (<),[17, 19] (% ),[19, 21] (b ),[21, 22] (%),[22, 24] (>\n)}
-
-Source :
-<a>
-<bcd
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 9] (<bcd
-)
-[9, 10] (<)
-[10, 12] (% )
-[12, 14] (a )
-[14, 15] (%)
-[15, 17] (>
-)
-[17, 18] (<)
-[18, 20] (% )
-[20, 22] (b )
-[22, 23] (%)
-[23, 25] (>
-)
-[25, 29] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[25, 29] (</a>)
-----#text(\n)@[3, 4] (\n)
-----bcd@[4, 9] (<bcd\n)
-------#text(<% a %>\n<% b %>\n)@{[9, 10] (<),[10, 12] (% ),[12, 14] (a ),[14, 15] (%),[15, 17] (>\n),[17, 18] (<),[18, 20] (% ),[20, 22] (b ),[22, 23] (%),[23, 25] (>\n)}
-
-Source :
-<a>
-<bcde
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 10] (<bcde
-)
-[10, 11] (<)
-[11, 13] (% )
-[13, 15] (a )
-[15, 16] (%)
-[16, 18] (>
-)
-[18, 19] (<)
-[19, 21] (% )
-[21, 23] (b )
-[23, 24] (%)
-[24, 26] (>
-)
-[26, 30] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[26, 30] (</a>)
-----#text(\n)@[3, 4] (\n)
-----bcde@[4, 10] (<bcde\n)
-------#text(<% a %>\n<% b %>\n)@{[10, 11] (<),[11, 13] (% ),[13, 15] (a ),[15, 16] (%),[16, 18] (>\n),[18, 19] (<),[19, 21] (% ),[21, 23] (b ),[23, 24] (%),[24, 26] (>\n)}
-
-Source :
-<a>
-<bcde>
-<% a %>
-<% b %>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 10] (<bcde>)
-[10, 11] (
-)
-[11, 12] (<)
-[12, 14] (% )
-[14, 16] (a )
-[16, 17] (%)
-[17, 19] (>
-)
-[19, 20] (<)
-[20, 22] (% )
-[22, 24] (b )
-[24, 25] (%)
-[25, 27] (>
-)
-[27, 31] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[27, 31] (</a>)
-----#text(\n)@[3, 4] (\n)
-----bcde@[4, 10] (<bcde>)
-------#text(\n<% a %>\n<% b %>\n)@{[10, 11] (\n),[11, 12] (<),[12, 14] (% ),[14, 16] (a ),[16, 17] (%),[17, 19] (>\n),[19, 20] (<),[20, 22] (% ),[22, 24] (b ),[24, 25] (%),[25, 27] (>\n)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest.txt
deleted file mode 100644
index 12a90039c..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aabbbbccc)@[3, 12] (aabbbbccc)
-
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aa)@[3,5]([3, 12] (aabbbbccc))
-----#text(bbbbccc)@[5,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aa)@[3,5]([3, 12] (aabbbbccc))
-----#text(bbbb)@[5,9]([3, 12] (aabbbbccc))
-----#text(ccc)@[9,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aaccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 8] (aaccc)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(aa)@[3,5]([3, 8] (aaccc))
-----#text(ccc)@[5,8]([3, 8] (aaccc))
-
-Source :
-<p>aadddddddccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 15] (aadddddddccc)
-[15, 19] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[15, 19] (</p>)
-----#text(aaddddddd)@[3,12]([3, 15] (aadddddddccc))
-----#text(ccc)@[12,15]([3, 15] (aadddddddccc))
-
-Source :
-<p>aadddddddccceee</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 18] (aadddddddccceee)
-[18, 22] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[18, 22] (</p>)
-----#text(aaddddddd)@[3,12]([3, 18] (aadddddddccceee))
-----#text(ccceee)@[12,18]([3, 18] (aadddddddccceee))
-
-Source :
-<p>aadddddddbbbbccceee</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 22] (aadddddddbbbbccceee)
-[22, 26] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[22, 26] (</p>)
-----#text(aaddddddd)@[3,12]([3, 22] (aadddddddbbbbccceee))
-----#text(bbbb)@[12,16]([3, 22] (aadddddddbbbbccceee))
-----#text(ccceee)@[16,22]([3, 22] (aadddddddbbbbccceee))
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest2.txt
deleted file mode 100644
index 3a122c68e..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest2.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest2
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aabbbbccc)@[3, 12] (aabbbbccc)
-
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aa)@[3,5]([3, 12] (aabbbbccc))
-----#text(bbbbccc)@[5,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aa)@[3,5]([3, 12] (aabbbbccc))
-----#text(bbbb)@[5,9]([3, 12] (aabbbbccc))
-----#text(ccc)@[9,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aaccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 8] (aaccc)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(aa)@[3,5]([3, 8] (aaccc))
-----#text(ccc)@[5,8]([3, 8] (aaccc))
-
-Source :
-<p>aa<b>bbbb</b>ccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 19] (ccc)
-[19, 23] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[19, 23] (</p>)
-----#text(aa)@[3, 5] (aa)
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-----#text(ccc)@[16, 19] (ccc)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest3.txt
deleted file mode 100644
index 4453a5074..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest3.txt
+++ /dev/null
@@ -1,91 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest3
-Source :
-<p>aa</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 9] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[5, 9] (</p>)
-----#text(aa)@[3, 5] (aa)
-
-Source :
-<p>aa<b>bbbb</b></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 20] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[16, 20] (</p>)
-----#text(aa)@[3, 5] (aa)
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-
-Source :
-<p>aa<b>bbbb</b>ccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 19] (ccc)
-[19, 23] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[19, 23] (</p>)
-----#text(aa)@[3, 5] (aa)
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-----#text(ccc)@[16, 19] (ccc)
-
-Source :
-<p>aaccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 8] (aaccc)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(aa)@[3,5]([3, 8] (aaccc))
-----#text(ccc)@[5,8]([3, 8] (aaccc))
-
-Source :
-<p>aa<b>bbbb</b>ccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 19] (ccc)
-[19, 23] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[19, 23] (</p>)
-----#text(aa)@[3, 5] (aa)
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-----#text(ccc)@[16, 19] (ccc)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest4.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest4.txt
deleted file mode 100644
index 07bbf30bb..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest4.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest4
-Source :
-<p></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[3, 7] (</p>)
-----#text()
-
-Source :
-<p>aaa</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 6] (aaa)
-[6, 10] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[6, 10] (</p>)
-----#text(aaa)@[3, 6] (aaa)
-
-Source :
-<p></p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[3, 7] (</p>)
-----#text()
-
-Source :
-<p>cccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 7] (cccc)
-[7, 11] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[7, 11] (</p>)
-----#text(cccc)@[3, 7] (cccc)
-----#text()
-
-Source :
-<p>ccccaaa</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 10] (ccccaaa)
-[10, 14] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[10, 14] (</p>)
-----#text(cccc)@[3,7]([3, 10] (ccccaaa))
-----#text(aaa)@[7,10]([3, 10] (ccccaaa))
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest5.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest5.txt
deleted file mode 100644
index 9cedb59fb..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest5.txt
+++ /dev/null
@@ -1,138 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest5
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aabbbbccc)@[3, 12] (aabbbbccc)
-
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aabbbb)@[3,9]([3, 12] (aabbbbccc))
-----#text(ccc)@[9,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aabbbb<br>ccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 9] (aabbbb)
-[9, 13] (<br>)
-[13, 16] (ccc)
-[16, 20] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[16, 20] (</p>)
-----#text(aabbbb)@[3, 9] (aabbbb)
-----br@[9, 13] (<br>)
-----#text(ccc)@[13, 16] (ccc)
-
-Source :
-<p>aabbbb<br>cccd</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 9] (aabbbb)
-[9, 13] (<br>)
-[13, 17] (cccd)
-[17, 21] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[17, 21] (</p>)
-----#text(aabbbb)@[3, 9] (aabbbb)
-----br@[9, 13] (<br>)
-----#text(cccd)@[13, 17] (cccd)
-
-Source :
-<p>aabbbb<br>cccde</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 9] (aabbbb)
-[9, 13] (<br>)
-[13, 18] (cccde)
-[18, 22] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[18, 22] (</p>)
-----#text(aabbbb)@[3, 9] (aabbbb)
-----br@[9, 13] (<br>)
-----#text(cccde)@[13, 18] (cccde)
-
-Source :
-<p>aa<b>bbbb</b><br>cccde</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 20] (<br>)
-[20, 25] (cccde)
-[25, 29] (</p>)
-
-StructuredDocumentRegionChecker : warning : vain
-Tree :
-#document
---p/p@[0, 3] (<p>)@[25, 29] (</p>)
-----#text(aa)@[3,5]([3, 5] (aa))
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-----br@[16, 20] (<br>)
-----#text(cccde)@[20, 25] (cccde)
-
-Source :
-<p>aa<b>bbbb</b><br><i>ccc</i>de</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (aa)
-[5, 8] (<b>)
-[8, 12] (bbbb)
-[12, 16] (</b>)
-[16, 20] (<br>)
-[20, 23] (<i>)
-[23, 26] (ccc)
-[26, 30] (</i>)
-[30, 32] (de)
-[32, 36] (</p>)
-
-StructuredDocumentRegionChecker : warning : vain
-StructuredDocumentRegionChecker : warning : vain
-Tree :
-#document
---p/p@[0, 3] (<p>)@[32, 36] (</p>)
-----#text(aa)@[3,5]([3, 5] (aa))
-----b/b@[5, 8] (<b>)@[12, 16] (</b>)
-------#text(bbbb)@[8, 12] (bbbb)
-----br@[16, 20] (<br>)
-----i/i@[20, 23] (<i>)@[26, 30] (</i>)
-------#text(ccc)@[23, 26] (ccc)
-----#text(de)@[30,32]([30, 32] (de))
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest6.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest6.txt
deleted file mode 100644
index 29175f4ca..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest6.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest6
-Source :
-<p>aabbbbccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 12] (aabbbbccc)
-[12, 16] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[12, 16] (</p>)
-----#text(aa)@[3,5]([3, 12] (aabbbbccc))
-----#text(bbbb)@[5,9]([3, 12] (aabbbbccc))
-----#text(ccc)@[9,12]([3, 12] (aabbbbccc))
-
-Source :
-<p>aabbbbdccc</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 13] (aabbbbdccc)
-[13, 17] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[13, 17] (</p>)
-----#text(aa)@[3,5]([3, 13] (aabbbbdccc))
-----#text(bbbbd)@[5,10]([3, 13] (aabbbbdccc))
-----#text(ccc)@[10,13]([3, 13] (aabbbbdccc))
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest7.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest7.txt
deleted file mode 100644
index 5f39e7599..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest7.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest7
-Source :
-<p>aaaabbbb</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 11] (aaaabbbb)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(aaaa)@[3,7]([3, 11] (aaaabbbb))
-----#text(bbbb)@[7,11]([3, 11] (aaaabbbb))
-
-Source :
-<p>aaabb</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 8] (aaabb)
-[8, 12] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[8, 12] (</p>)
-----#text(aaabb)@[3, 8] (aaabb)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest8.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest8.txt
deleted file mode 100644
index de4e783bb..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.SplitTextTest8.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.SplitTextTest8
-Source :
-<p>aaaabbbb</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 11] (aaaabbbb)
-[11, 15] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[11, 15] (</p>)
-----#text(aaaa)@[3,7]([3, 11] (aaaabbbb))
-----#text(bbbb)@[7,11]([3, 11] (aaaabbbb))
-
-Source :
-<p>ab</p>
-
-
-StructuredDocument Regions :
-[0, 3] (<p>)
-[3, 5] (ab)
-[5, 9] (</p>)
-
-Tree :
-#document
---p/p@[0, 3] (<p>)@[5, 9] (</p>)
-----#text(ab)@[3, 5] (ab)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TableTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TableTest.txt
deleted file mode 100644
index 084ebdb74..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TableTest.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.TableTest
-Source :
-<html></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 13] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[6, 13] (</html>)
-
-Source :
-<html><body></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 19] (</body>)
-[19, 26] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[19, 26] (</html>)
-----body/body@[6, 12] (<body>)@[12, 19] (</body>)
-
-Source :
-<html><body><table border="1"><tr><td></td><td></td></tr><tr><td></td><td></td></tr></table></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 30] (<table border="1">)
-[30, 34] (<tr>)
-[34, 38] (<td>)
-[38, 43] (</td>)
-[43, 47] (<td>)
-[47, 52] (</td>)
-[52, 57] (</tr>)
-[57, 61] (<tr>)
-[61, 65] (<td>)
-[65, 70] (</td>)
-[70, 74] (<td>)
-[74, 79] (</td>)
-[79, 84] (</tr>)
-[84, 92] (</table>)
-[92, 99] (</body>)
-[99, 106] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[99, 106] (</html>)
-----body/body@[6, 12] (<body>)@[92, 99] (</body>)
-------table/table@[12, 30] (<table border&#61;"1">)@[84, 92] (</table>)
---------tr/tr@[30, 34] (<tr>)@[52, 57] (</tr>)
-----------td/td@[34, 38] (<td>)@[38, 43] (</td>)
-----------td/td@[43, 47] (<td>)@[47, 52] (</td>)
---------tr/tr@[57, 61] (<tr>)@[79, 84] (</tr>)
-----------td/td@[61, 65] (<td>)@[65, 70] (</td>)
-----------td/td@[70, 74] (<td>)@[74, 79] (</td>)
-
-Source :
-<html><body><table border="1"><tr><td></td><td></td></tr><tr><td></td><td><font color="red">text</font></td></tr></table></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 30] (<table border="1">)
-[30, 34] (<tr>)
-[34, 38] (<td>)
-[38, 43] (</td>)
-[43, 47] (<td>)
-[47, 52] (</td>)
-[52, 57] (</tr>)
-[57, 61] (<tr>)
-[61, 65] (<td>)
-[65, 70] (</td>)
-[70, 74] (<td>)
-[74, 92] (<font color="red">)
-[92, 96] (text)
-[96, 103] (</font>)
-[103, 108] (</td>)
-[108, 113] (</tr>)
-[113, 121] (</table>)
-[121, 128] (</body>)
-[128, 135] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[128, 135] (</html>)
-----body/body@[6, 12] (<body>)@[121, 128] (</body>)
-------table/table@[12, 30] (<table border&#61;"1">)@[113, 121] (</table>)
---------tr/tr@[30, 34] (<tr>)@[52, 57] (</tr>)
-----------td/td@[34, 38] (<td>)@[38, 43] (</td>)
-----------td/td@[43, 47] (<td>)@[47, 52] (</td>)
---------tr/tr@[57, 61] (<tr>)@[108, 113] (</tr>)
-----------td/td@[61, 65] (<td>)@[65, 70] (</td>)
-----------td/td@[70, 74] (<td>)@[103, 108] (</td>)
-------------font/font@[74, 92] (<font color&#61;"red">)@[96, 103] (</font>)
---------------#text(text)@[92, 96] (text)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest.txt
deleted file mode 100644
index e892cf29d..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.TextTest
-Source :
-<a>hello &amp;lt;</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 14] (&amp;)
-[14, 17] (lt;)
-[17, 21] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[17, 21] (</a>)
-----#text(hello &lt;)@{[3, 9] (hello ),[9, 14] (&amp;),[14, 17] (lt;)}
-
-hello &lt;
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest2.txt
deleted file mode 100644
index ab2ba5351..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest2.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.TextTest2
-Source :
-<a>hello &amp;lt;</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 14] (&amp;)
-[14, 17] (lt;)
-[17, 21] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[17, 21] (</a>)
-----#text(hello &lt;)@{[3, 9] (hello ),[9, 14] (&amp;),[14, 17] (lt;)}
-
-hello &lt;
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest3.txt
deleted file mode 100644
index 0b04a3bf6..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.TextTest3.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.TextTest3
-Invalid character ('<') found
-Source :
-<a>text</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (text)
-[7, 11] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[7, 11] (</a>)
-----#text(text)@[3, 7] (text)
-
-Source :
-<a>hello &lt;</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 13] (&lt;)
-[13, 17] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[13, 17] (</a>)
-----#text(hello <)@{[3, 9] (hello ),[9, 13] (&lt;)}
-
-Invalid character ('&') found
-Source :
-<a>hello &lt;</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 13] (&lt;)
-[13, 17] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[13, 17] (</a>)
-----#text(hello <)@{[3, 9] (hello ),[9, 13] (&lt;)}
-
-Source :
-<a>hello &#65;</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 14] (&#65;)
-[14, 18] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[14, 18] (</a>)
-----#text(hello A)@{[3, 9] (hello ),[9, 14] (&#65;)}
-
-Invalid character ('&') found
-Source :
-<a>hello &#65;</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (hello )
-[9, 14] (&#65;)
-[14, 18] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[14, 18] (</a>)
-----#text(hello A)@{[3, 9] (hello ),[9, 14] (&#65;)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest.txt
deleted file mode 100644
index 69fe98069..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest.txt
+++ /dev/null
@@ -1,197 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest
-Source :
-<html></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 13] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[6, 13] (</html>)
-
-Source :
-<html><body></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 19] (</body>)
-[19, 26] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[19, 26] (</html>)
-----body/body@[6, 12] (<body>)@[12, 19] (</body>)
-
-Source :
-<html><body><p></p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (</p>)
-[19, 26] (</body>)
-[26, 33] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[26, 33] (</html>)
-----body/body@[6, 12] (<body>)@[19, 26] (</body>)
-------p/p@[12, 15] (<p>)@[15, 19] (</p>)
-
-Source :
-<html><body><p>text</p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (text)
-[19, 23] (</p>)
-[23, 30] (</body>)
-[30, 37] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[30, 37] (</html>)
-----body/body@[6, 12] (<body>)@[23, 30] (</body>)
-------p/p@[12, 15] (<p>)@[19, 23] (</p>)
---------#text(text)@[15, 19] (text)
-
-Source :
-<html><body><p><br>text</p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (<br>)
-[19, 23] (text)
-[23, 27] (</p>)
-[27, 34] (</body>)
-[34, 41] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[34, 41] (</html>)
-----body/body@[6, 12] (<body>)@[27, 34] (</body>)
-------p/p@[12, 15] (<p>)@[23, 27] (</p>)
---------br@[15, 19] (<br>)
---------#text(text)@[19, 23] (text)
-
-Source :
-<html><body><p><br>text<img></p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (<br>)
-[19, 23] (text)
-[23, 28] (<img>)
-[28, 32] (</p>)
-[32, 39] (</body>)
-[39, 46] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[39, 46] (</html>)
-----body/body@[6, 12] (<body>)@[32, 39] (</body>)
-------p/p@[12, 15] (<p>)@[28, 32] (</p>)
---------br@[15, 19] (<br>)
---------#text(text)@[19, 23] (text)
---------img@[23, 28] (<img>)
-
-Source :
-<html><body><p><br><img></p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (<br>)
-[19, 24] (<img>)
-[24, 28] (</p>)
-[28, 35] (</body>)
-[35, 42] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[35, 42] (</html>)
-----body/body@[6, 12] (<body>)@[28, 35] (</body>)
-------p/p@[12, 15] (<p>)@[24, 28] (</p>)
---------br@[15, 19] (<br>)
---------img@[19, 24] (<img>)
-
-Source :
-<html><body><p><br>text<img></p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (<br>)
-[19, 23] (text)
-[23, 28] (<img>)
-[28, 32] (</p>)
-[32, 39] (</body>)
-[39, 46] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[39, 46] (</html>)
-----body/body@[6, 12] (<body>)@[32, 39] (</body>)
-------p/p@[12, 15] (<p>)@[28, 32] (</p>)
---------br@[15, 19] (<br>)
---------#text(text)@[19, 23] (text)
---------img@[23, 28] (<img>)
-
-Source :
-<html><body></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 19] (</body>)
-[19, 26] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[19, 26] (</html>)
-----body/body@[6, 12] (<body>)@[12, 19] (</body>)
-
-Source :
-<html><body><p><br>text<img></p></body></html>
-
-
-StructuredDocument Regions :
-[0, 6] (<html>)
-[6, 12] (<body>)
-[12, 15] (<p>)
-[15, 19] (<br>)
-[19, 23] (text)
-[23, 28] (<img>)
-[28, 32] (</p>)
-[32, 39] (</body>)
-[39, 46] (</html>)
-
-Tree :
-#document
---html/html@[0, 6] (<html>)@[39, 46] (</html>)
-----body/body@[6, 12] (<body>)@[32, 39] (</body>)
-------p/p@[12, 15] (<p>)@[28, 32] (</p>)
---------br@[15, 19] (<br>)
---------#text(text)@[19, 23] (text)
---------img@[23, 28] (<img>)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest10.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest10.txt
deleted file mode 100644
index b8f7da258..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest10.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest10
-Source :
-<a b="c"><b></b></a>
-
-
-StructuredDocument Regions :
-[0, 9] (<a b="c">)
-[9, 12] (<b>)
-[12, 16] (</b>)
-[16, 20] (</a>)
-
-Tree :
-#document
---a/a@[0, 9] (<a b&#61;"c">)@[16, 20] (</a>)
-----b/b@[9, 12] (<b>)@[12, 16] (</b>)
-
-IStructuredDocumentRegion:
-<b>
-0(<)true
-0(b)true
-0(>)true
-
-Source :
-<a b="c"><b c="d"></b></a>
-
-
-StructuredDocument Regions :
-[0, 9] (<a b="c">)
-[9, 18] (<b c="d">)
-[18, 22] (</b>)
-[22, 26] (</a>)
-
-Tree :
-#document
---a/a@[0, 9] (<a b&#61;"c">)@[22, 26] (</a>)
-----b/b@[9, 18] (<b c&#61;"d">)@[18, 22] (</b>)
-
-IStructuredDocumentRegion:
-<b c="d">
-0(<)true
-0(b)true
-0(c)true
-0(=)true
-0("d")true
-0(>)true
-
-Source :
-<a b="cd"><b c="d"></b></a>
-
-
-StructuredDocument Regions :
-[0, 10] (<a b="cd">)
-[10, 19] (<b c="d">)
-[19, 23] (</b>)
-[23, 27] (</a>)
-
-Tree :
-#document
---a/a@[0, 10] (<a b&#61;"cd">)@[23, 27] (</a>)
-----b/b@[10, 19] (<b c&#61;"d">)@[19, 23] (</b>)
-
-IStructuredDocumentRegion:
-<b c="d">
-0(<)true
-0(b)true
-0(c)true
-0(=)true
-0("d")true
-0(>)true
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest11.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest11.txt
deleted file mode 100644
index 3988cb310..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest11.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest11
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest12.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest12.txt
deleted file mode 100644
index 811a8f7a8..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest12.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest12
-Source :
-<a></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[3, 7] (</a>)
-
-Source :
-<a></a><a></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (</a>)
-[7, 10] (<a>)
-[10, 14] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[3, 7] (</a>)
---a/a@[7, 10] (<a>)@[10, 14] (</a>)
-
-Source :
-<a></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[3, 7] (</a>)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest13.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest13.txt
deleted file mode 100644
index 4854f7e6c..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest13.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest13
-Source :
-<a>
-<b>
-</b>  </a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 5] (
-)
-[5, 8] (<b>)
-[8, 10] (
-)
-[10, 14] (</b>)
-[14, 16] (  )
-[16, 20] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[16, 20] (</a>)
-----#text(\r\n)@[3, 5] (\r\n)
-----b/b@[5, 8] (<b>)@[10, 14] (</b>)
-------#text(\r\n)@[8, 10] (\r\n)
-----#text(  )@[14, 16] (  )
-
-Source :
-<a>
-  </a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (
-  )
-[7, 11] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[7, 11] (</a>)
-----#text(\r\n)@[3,5]([3, 7] (\r\n  ))
-----#text(  )@[5,7]([3, 7] (\r\n  ))
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest14.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest14.txt
deleted file mode 100644
index 9e6d5b6bb..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest14.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest14
-Source :
-<%= aaaa %>
-
-
-StructuredDocument Regions :
-[0, 1] (<)
-[1, 4] (%= )
-[4, 9] (aaaa )
-[9, 10] (%)
-[10, 11] (>)
-
-Tree :
-#document
---#text(<%&#61; aaaa %>)@{[0, 1] (<),[1, 4] (%&#61; ),[4, 9] (aaaa ),[9, 10] (%),[10, 11] (>)}
-
-Source :
-<% = aaaa %>
-
-
-StructuredDocument Regions :
-[0, 1] (<)
-[1, 5] (% = )
-[5, 10] (aaaa )
-[10, 11] (%)
-[11, 12] (>)
-
-Tree :
-#document
---#text(<% &#61; aaaa %>)@{[0, 1] (<),[1, 5] (% &#61; ),[5, 10] (aaaa ),[10, 11] (%),[11, 12] (>)}
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest2.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest2.txt
deleted file mode 100644
index 64dcf1f2a..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest2.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest2
-Source :
-<HTML>
-<HEAD></HEAD>
-<BODY></BODY>
-</HTML>
-
-
-
-StructuredDocument Regions :
-[0, 6] (<HTML>)
-[6, 8] (
-)
-[8, 14] (<HEAD>)
-[14, 21] (</HEAD>)
-[21, 23] (
-)
-[23, 29] (<BODY>)
-[29, 36] (</BODY>)
-[36, 38] (
-)
-[38, 45] (</HTML>)
-[45, 47] (
-)
-
-Tree :
-#document
---HTML/HTML@[0, 6] (<HTML>)@[38, 45] (</HTML>)
-----#text(\r\n)@[6, 8] (\r\n)
-----HEAD/HEAD@[8, 14] (<HEAD>)@[14, 21] (</HEAD>)
-----#text(\r\n)@[21, 23] (\r\n)
-----BODY/BODY@[23, 29] (<BODY>)@[29, 36] (</BODY>)
-----#text(\r\n)@[36, 38] (\r\n)
---#text(\r\n)@[45, 47] (\r\n)
-
-Source :
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Updater Test 2">
-</HEAD>
-<BODY></BODY>
-</HTML>
-
-
-
-StructuredDocument Regions :
-[0, 6] (<HTML>)
-[6, 8] (
-)
-[8, 14] (<HEAD>)
-[14, 16] (
-)
-[16, 64] (<meta name="GENERATOR" content="Updater Test 2">)
-[64, 66] (
-)
-[66, 73] (</HEAD>)
-[73, 75] (
-)
-[75, 81] (<BODY>)
-[81, 88] (</BODY>)
-[88, 90] (
-)
-[90, 97] (</HTML>)
-[97, 99] (
-)
-
-Tree :
-#document
---HTML/HTML@[0, 6] (<HTML>)@[90, 97] (</HTML>)
-----#text(\r\n)@[6, 8] (\r\n)
-----HEAD/HEAD@[8, 14] (<HEAD>)@[66, 73] (</HEAD>)
-------#text(\r\n)@[14, 16] (\r\n)
-------meta@[16, 64] (<meta name&#61;"GENERATOR" content&#61;"Updater Test 2">)
-------#text(\r\n)@[64, 66] (\r\n)
-----#text(\r\n)@[73, 75] (\r\n)
-----BODY/BODY@[75, 81] (<BODY>)@[81, 88] (</BODY>)
-----#text(\r\n)@[88, 90] (\r\n)
---#text(\r\n)@[97, 99] (\r\n)
-
-Source :
-<HTML>
-<HEAD>
-<meta name="GENERATOR" content="Updater Test 2">
-<title></title></HEAD>
-<BODY></BODY>
-</HTML>
-
-
-
-StructuredDocument Regions :
-[0, 6] (<HTML>)
-[6, 8] (
-)
-[8, 14] (<HEAD>)
-[14, 16] (
-)
-[16, 64] (<meta name="GENERATOR" content="Updater Test 2">)
-[64, 66] (
-)
-[66, 73] (<title>)
-[73, 81] (</title>)
-[81, 88] (</HEAD>)
-[88, 90] (
-)
-[90, 96] (<BODY>)
-[96, 103] (</BODY>)
-[103, 105] (
-)
-[105, 112] (</HTML>)
-[112, 114] (
-)
-
-Tree :
-#document
---HTML/HTML@[0, 6] (<HTML>)@[105, 112] (</HTML>)
-----#text(\r\n)@[6, 8] (\r\n)
-----HEAD/HEAD@[8, 14] (<HEAD>)@[81, 88] (</HEAD>)
-------#text(\r\n)@[14, 16] (\r\n)
-------meta@[16, 64] (<meta name&#61;"GENERATOR" content&#61;"Updater Test 2">)
-------#text(\r\n)@[64, 66] (\r\n)
-------title/title@[66, 73] (<title>)@[73, 81] (</title>)
---------#text()
-----#text(\r\n)@[88, 90] (\r\n)
-----BODY/BODY@[90, 96] (<BODY>)@[96, 103] (</BODY>)
-----#text(\r\n)@[103, 105] (\r\n)
---#text(\r\n)@[112, 114] (\r\n)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest3.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest3.txt
deleted file mode 100644
index 4ac73a54b..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest3.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest3
-Source :
-<a><b></b></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 6] (<b>)
-[6, 10] (</b>)
-[10, 14] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[10, 14] (</a>)
-----b/b@[3, 6] (<b>)@[6, 10] (</b>)
-
-Source :
-<a>
-<b></b></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 7] (<b>)
-[7, 11] (</b>)
-[11, 15] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[11, 15] (</a>)
-----#text(\n)@[3, 4] (\n)
-----b/b@[4, 7] (<b>)@[7, 11] (</b>)
-
-Source :
-<a>
-<b></b>
-</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (
-)
-[4, 7] (<b>)
-[7, 11] (</b>)
-[11, 12] (
-)
-[12, 16] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[12, 16] (</a>)
-----#text(\n)@[3, 4] (\n)
-----b/b@[4, 7] (<b>)@[7, 11] (</b>)
-----#text(\n)@[11, 12] (\n)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest4.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest4.txt
deleted file mode 100644
index a10d026ae..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest4.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest4
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest5.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest5.txt
deleted file mode 100644
index 95e13ea64..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest5.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest5
-Source :
-<a>&apos;</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (&apos;)
-[9, 13] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[9, 13] (</a>)
-----#text(')@[3, 9] (&apos;)
-
-Source :
-<a>&apos;</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 9] (&apos;)
-[9, 13] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[9, 13] (</a>)
-----#text(')@[3, 9] (&apos;)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest6.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest6.txt
deleted file mode 100644
index f9c4d7abe..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest6.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest6
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
-Source :
-<a></a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 7] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[3, 7] (</a>)
-
-Source :
-<a>b</a>
-
-
-StructuredDocument Regions :
-[0, 3] (<a>)
-[3, 4] (b)
-[4, 8] (</a>)
-
-Tree :
-#document
---a/a@[0, 3] (<a>)@[4, 8] (</a>)
-----#text(b)@[3, 4] (b)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest7.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest7.txt
deleted file mode 100644
index 0b4a487cd..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest7.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest7
-Source :
-<P><B></B></P>
-
-
-StructuredDocument Regions :
-[0, 3] (<P>)
-[3, 6] (<B>)
-[6, 10] (</B>)
-[10, 14] (</P>)
-
-Tree :
-#document
---P/P@[0, 3] (<P>)@[10, 14] (</P>)
-----B/B@[3, 6] (<B>)@[6, 10] (</B>)
-
-Source :
-<P><B></B><B></B></P>
-
-
-StructuredDocument Regions :
-[0, 3] (<P>)
-[3, 6] (<B>)
-[6, 10] (</B>)
-[10, 13] (<B>)
-[13, 17] (</B>)
-[17, 21] (</P>)
-
-Tree :
-#document
---P/P@[0, 3] (<P>)@[17, 21] (</P>)
-----B/B@[3, 6] (<B>)@[6, 10] (</B>)
-----B/B@[10, 13] (<B>)@[13, 17] (</B>)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest8.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest8.txt
deleted file mode 100644
index e5f6e3212..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest8.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest8
-Source :
-<P></P>
-
-
-StructuredDocument Regions :
-[0, 3] (<P>)
-[3, 7] (</P>)
-
-Tree :
-#document
---P/P@[0, 3] (<P>)@[3, 7] (</P>)
-
-Source :
-<P></P><P></P>
-
-
-StructuredDocument Regions :
-[0, 3] (<P>)
-[3, 7] (</P>)
-[7, 10] (<P>)
-[10, 14] (</P>)
-
-Tree :
-#document
---P/P@[0, 3] (<P>)@[3, 7] (</P>)
---P/P@[7, 10] (<P>)@[10, 14] (</P>)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest9.txt b/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest9.txt
deleted file mode 100644
index 6a4a8ad84..000000000
--- a/tests/org.eclipse.wst.html.core.tests/ParserResults2004-12-10-22-23-47/org.eclipse.wst.html.core.tests.parser.UpdaterTest9.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-org.eclipse.wst.html.core.tests.parser.UpdaterTest9
-Source :
-<style></style>
-
-
-StructuredDocument Regions :
-[0, 7] (<style>)
-[7, 15] (</style>)
-
-Tree :
-#document
---style/style@[0, 7] (<style>)@[7, 15] (</style>)
-
-Source :
-<style>p</style>
-
-
-StructuredDocument Regions :
-[0, 7] (<style>)
-[7, 8] (p)
-[8, 16] (</style>)
-
-Tree :
-#document
---style/style@[0, 7] (<style>)@[8, 16] (</style>)
-----#text(p)@[7, 8] (p)
-
diff --git a/tests/org.eclipse.wst.html.core.tests/aNoteOnParserResultsDirectories.txt b/tests/org.eclipse.wst.html.core.tests/aNoteOnParserResultsDirectories.txt
deleted file mode 100644
index 8e241889f..000000000
--- a/tests/org.eclipse.wst.html.core.tests/aNoteOnParserResultsDirectories.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-These notes pertain to the v20041210_2300 version 
-in CVS repository. 
-
-Note, the "05-24" directory *should* match
-the parser results from parser of same date, 
-*but* after transition to org.eclipse, it seems 
-the case of tags is different. Oddly, seems 
-like the current treatement of case is correct, 
-so ... 12-10 parser results should be used as 
-reference, unless some new insight is gained. 
-It does match previous version except for case. 
-(And, the previous version was changed "by hand" 
-to accomidate the transition to org.eclipse). 
-
-TODO: this file, and 05-24 reference directory
-can be deleted around M3, once whole team has 
-reviewed and confident 12-10 version is correct
-reference. 
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/about.html b/tests/org.eclipse.wst.html.core.tests/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.wst.html.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.html.core.tests/build.properties b/tests/org.eclipse.wst.html.core.tests/build.properties
deleted file mode 100644
index 8adf61657..000000000
--- a/tests/org.eclipse.wst.html.core.tests/build.properties
+++ /dev/null
@@ -1,18 +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
-###############################################################################
-source.htmlcoretests.jar = src/
-output.htmlcoretests.jar = bin/
-bin.includes = htmlcoretests.jar,\
-               plugin.xml,\
-               test.xml,\
-               ParserResults2004-12-10-22-23-47/,\
-               META-INF/,\
-               about.html
diff --git a/tests/org.eclipse.wst.html.core.tests/plugin.properties b/tests/org.eclipse.wst.html.core.tests/plugin.properties
deleted file mode 100644
index e8b3778da..000000000
--- a/tests/org.eclipse.wst.html.core.tests/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.html.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = HTML Core Tests
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/plugin.xml b/tests/org.eclipse.wst.html.core.tests/plugin.xml
deleted file mode 100644
index dc6aef0dc..000000000
--- a/tests/org.eclipse.wst.html.core.tests/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<!-- leave this empty plugin.xml here for now, 
-		because we do a funky thing 
-		to find it during the tests -->
-
-</plugin>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestSuite.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestSuite.java
deleted file mode 100644
index 430952c01..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestSuite.java
+++ /dev/null
@@ -1,47 +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.html.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.html.core.tests.misc.HTMLCorePreferencesTest;
-import org.eclipse.wst.html.core.tests.misc.HTMLTagInfoTest;
-import org.eclipse.wst.html.core.tests.model.BUG124835SetStyleAttributeValueTest;
-import org.eclipse.wst.html.core.tests.model.GetOverrideStyleTest;
-import org.eclipse.wst.html.core.tests.model.ModelModifications;
-import org.eclipse.wst.html.core.tests.model.TestForNPEInCSSCreation;
-
-
-
-public class HTMLCoreTestSuite extends TestSuite {
-
-	/**
-	 * to get picked up by BVT
-	 * 
-	 * @return
-	 */
-	public static Test suite() {
-		return new HTMLCoreTestSuite();
-	}
-
-	public HTMLCoreTestSuite() {
-		super("HTML Core TestSuite");
-
-		addTest(ModelParserTests.suite());
-		addTest(new TestSuite(HTMLCorePreferencesTest.class));
-		addTest(new TestSuite(HTMLTagInfoTest.class));
-		addTest(new TestSuite(ModelModifications.class));
-		addTest(new TestSuite(TestForNPEInCSSCreation.class));
-		addTest(new TestSuite(GetOverrideStyleTest.class));
-		addTest(new TestSuite(BUG124835SetStyleAttributeValueTest.class));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestsPlugin.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestsPlugin.java
deleted file mode 100644
index b37c006d3..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/HTMLCoreTestsPlugin.java
+++ /dev/null
@@ -1,68 +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.html.core.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class HTMLCoreTestsPlugin extends Plugin {
-	//The shared instance.
-	private static HTMLCoreTestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public HTMLCoreTestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.html.core.tests.SSEModelHTMLTestsPluginResources");
-		}
-		catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static HTMLCoreTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = HTMLCoreTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/Logger.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/Logger.java
deleted file mode 100644
index 509194e43..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/Logger.java
+++ /dev/null
@@ -1,144 +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.html.core.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.html.core.tests"; //$NON-NLS-1$
-	
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * Adds message to log.
-	 * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message text to add to the log
-	 * @param exception exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * @param message text to print
-	 * @param category category of the message, to be compared with /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/ModelParserTests.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/ModelParserTests.java
deleted file mode 100644
index 0652a53f1..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/ModelParserTests.java
+++ /dev/null
@@ -1,133 +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.html.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.html.core.tests.parser.AttrTest;
-import org.eclipse.wst.html.core.tests.parser.AttrTest2;
-import org.eclipse.wst.html.core.tests.parser.CDATASectionTest;
-import org.eclipse.wst.html.core.tests.parser.CDATASectionTest2;
-import org.eclipse.wst.html.core.tests.parser.CDATASectionTest3;
-import org.eclipse.wst.html.core.tests.parser.DocTypeTest;
-import org.eclipse.wst.html.core.tests.parser.ElementTest;
-import org.eclipse.wst.html.core.tests.parser.ElementTest2;
-import org.eclipse.wst.html.core.tests.parser.ElementTest3;
-import org.eclipse.wst.html.core.tests.parser.EmptyTextTest;
-import org.eclipse.wst.html.core.tests.parser.EmptyTextTest2;
-import org.eclipse.wst.html.core.tests.parser.EmptyTextTest3;
-import org.eclipse.wst.html.core.tests.parser.EntityTest;
-import org.eclipse.wst.html.core.tests.parser.EntityTest2;
-import org.eclipse.wst.html.core.tests.parser.EntityTest3;
-import org.eclipse.wst.html.core.tests.parser.EntityTest4;
-import org.eclipse.wst.html.core.tests.parser.EntityTest5;
-import org.eclipse.wst.html.core.tests.parser.EntityTest6;
-import org.eclipse.wst.html.core.tests.parser.EntityTest7;
-import org.eclipse.wst.html.core.tests.parser.EntityTest8;
-import org.eclipse.wst.html.core.tests.parser.EntityTest9;
-import org.eclipse.wst.html.core.tests.parser.PITest;
-import org.eclipse.wst.html.core.tests.parser.ParserTest;
-import org.eclipse.wst.html.core.tests.parser.ParserTest2;
-import org.eclipse.wst.html.core.tests.parser.ParserTest3;
-import org.eclipse.wst.html.core.tests.parser.ParserTest4;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest2;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest3;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest4;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest5;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest6;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest7;
-import org.eclipse.wst.html.core.tests.parser.SplitTextTest8;
-import org.eclipse.wst.html.core.tests.parser.TableTest;
-import org.eclipse.wst.html.core.tests.parser.TextTest;
-import org.eclipse.wst.html.core.tests.parser.TextTest2;
-import org.eclipse.wst.html.core.tests.parser.TextTest3;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest10;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest11;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest12;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest13;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest14;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest2;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest3;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest4;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest5;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest6;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest7;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest8;
-import org.eclipse.wst.html.core.tests.parser.UpdaterTest9;
-
-
-
-public class ModelParserTests extends TestSuite {
-	public static Test suite() {
-		return new ModelParserTests();
-	}
-
-	public ModelParserTests() {
-		super("ModelParserTests");
-
-		addTest(new TestSuite(ParserTest.class, "ParserTest"));
-		addTest(new TestSuite(ParserTest2.class, "ParserTest2"));
-		addTest(new TestSuite(ParserTest3.class, "ParserTest3"));
-		addTest(new TestSuite(ParserTest4.class, "ParserTest4"));
-		addTest(new TestSuite(UpdaterTest.class, "UpdaterTest"));
-		addTest(new TestSuite(UpdaterTest2.class, "UpdaterTest2"));
-		addTest(new TestSuite(UpdaterTest3.class, "UpdaterTest3"));
-		addTest(new TestSuite(UpdaterTest4.class, "UpdaterTest4"));
-		addTest(new TestSuite(UpdaterTest5.class, "UpdaterTest5"));
-		addTest(new TestSuite(UpdaterTest6.class, "UpdaterTest6"));
-		addTest(new TestSuite(UpdaterTest7.class, "UpdaterTest7"));
-		addTest(new TestSuite(UpdaterTest8.class, "UpdaterTest8"));
-		addTest(new TestSuite(UpdaterTest9.class, "UpdaterTest9"));
-		addTest(new TestSuite(UpdaterTest10.class, "UpdaterTest10"));
-		addTest(new TestSuite(UpdaterTest11.class, "UpdaterTest11"));
-		addTest(new TestSuite(UpdaterTest12.class, "UpdaterTest12"));
-		addTest(new TestSuite(UpdaterTest13.class, "UpdaterTest13"));
-		addTest(new TestSuite(UpdaterTest14.class, "UpdaterTest14"));
-		addTest(new TestSuite(ElementTest.class, "ElementTest"));
-		addTest(new TestSuite(ElementTest2.class, "ElementTest2"));
-		addTest(new TestSuite(ElementTest3.class, "ElementTest3"));
-		addTest(new TestSuite(TableTest.class, "TableTest"));
-		addTest(new TestSuite(TextTest.class, "TextTest"));
-		addTest(new TestSuite(TextTest2.class, "TextTest2"));
-		addTest(new TestSuite(TextTest3.class, "TextTest3"));
-		addTest(new TestSuite(SplitTextTest.class, "SplitTextTest"));
-		addTest(new TestSuite(SplitTextTest2.class, "SplitTextTest2"));
-		addTest(new TestSuite(SplitTextTest3.class, "SplitTextTest3"));
-		addTest(new TestSuite(SplitTextTest4.class, "SplitTextTest4"));
-		addTest(new TestSuite(SplitTextTest5.class, "SplitTextTest5"));
-		addTest(new TestSuite(SplitTextTest6.class, "SplitTextTest6"));
-		addTest(new TestSuite(SplitTextTest7.class, "SplitTextTest7"));
-		addTest(new TestSuite(SplitTextTest8.class, "SplitTextTest8"));
-		addTest(new TestSuite(EmptyTextTest.class, "EmptyTextTest"));
-		addTest(new TestSuite(EmptyTextTest2.class, "EmptyTextTest2"));
-		addTest(new TestSuite(EmptyTextTest3.class, "EmptyTextTest3"));
-		addTest(new TestSuite(AttrTest.class, "AttrTest"));
-		addTest(new TestSuite(AttrTest2.class, "AttrTest2"));
-		addTest(new TestSuite(EntityTest.class, "EntityTest"));
-		addTest(new TestSuite(EntityTest2.class, "EntityTest2"));
-		addTest(new TestSuite(EntityTest3.class, "EntityTest3"));
-		addTest(new TestSuite(EntityTest4.class, "EntityTest4"));
-		addTest(new TestSuite(EntityTest5.class, "EntityTest5"));
-		addTest(new TestSuite(EntityTest6.class, "EntityTest6"));
-		addTest(new TestSuite(EntityTest7.class, "EntityTest7"));
-		addTest(new TestSuite(EntityTest8.class, "EntityTest8"));
-		addTest(new TestSuite(EntityTest9.class, "EntityTest9"));
-		addTest(new TestSuite(DocTypeTest.class, "DocTypeTest"));
-		addTest(new TestSuite(CDATASectionTest.class, "CDATASectionTest"));
-		addTest(new TestSuite(CDATASectionTest2.class, "CDATASectionTest2"));
-		addTest(new TestSuite(CDATASectionTest3.class, "CDATASectionTest3"));
-		addTest(new TestSuite(PITest.class, "PITest"));
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLCorePreferencesTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLCorePreferencesTest.java
deleted file mode 100644
index 59276fc4f..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLCorePreferencesTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.misc;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.encoding.HTMLDocumentLoader;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the HTML Source
- * editor preferences. Tests include setting/getting preferences.
- * 
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class HTMLCorePreferencesTest extends TestCase {
-	/**
-	 * Tests existance of preference values when getting preference values
-	 * through Platform.getPreferencesService()
-	 */
-	public void testBundleGetPreferences() {
-		final String bundleName = "org.eclipse.wst.html.core";
-
-		// need to start up bundle for default values to be loaded
-		Bundle bundle = Platform.getBundle(bundleName);
-		try {
-			if (bundle != null)
-				bundle.start();
-			else
-				fail("Get preference value failed because could not find bundle: " + bundleName);
-		}
-		catch (BundleException e) {
-			fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
-		}
-
-		bundleGetPreference(bundleName, HTMLCorePreferenceNames.TAG_NAME_CASE);
-		bundleGetPreference(bundleName, HTMLCorePreferenceNames.ATTR_NAME_CASE);
-	}
-
-	private void bundleGetPreference(String bundleName, String prefKey) {
-		int defaultValue = -1;
-
-		int value = Platform.getPreferencesService().getInt(bundleName, prefKey, defaultValue, null);
-		assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
-	}
-
-	/**
-	 * Tests default values of preferences.
-	 * 
-	 * NOTE: Expected default values are hard-coded, so if default values do
-	 * get changed, assertions need to be updated as well
-	 */
-	public void testPluginGetDefaultPreferences() {
-		IEclipsePreferences node = new DefaultScope().getNode(HTMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		pluginGetDefaultPreference(node, HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS, Boolean.toString(false));
-		pluginGetDefaultPreference(node, HTMLCorePreferenceNames.ATTR_NAME_CASE, Integer.toString(HTMLCorePreferenceNames.LOWER));
-	}
-
-	private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
-		String defaultValue = Long.toString(System.currentTimeMillis()); // random
-		// string
-
-		String theDefaultValue = node.get(prefKey, defaultValue);
-		assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
-	}
-
-	/**
-	 * Tests setting preference values by setting preference value to be a
-	 * certain value, then getting the preference value to verify it was set.
-	 */
-	public void testPluginSetPreferences() {
-		IEclipsePreferences node = new InstanceScope().getNode(HTMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		pluginSetPreferenceBoolean(node, HTMLCorePreferenceNames.SPLIT_MULTI_ATTRS);
-		pluginSetPreferenceString(node, HTMLCorePreferenceNames.TAG_NAME_CASE);
-	}
-
-	private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
-		boolean originalValue = false;
-		boolean expectedValue = true;
-
-		String originalString = node.get(prefKey, "bogus");
-		if (!"bogus".equals(originalString)) {
-			originalValue = Boolean.valueOf(originalString).booleanValue();
-			expectedValue = !originalValue;
-		}
-		node.putBoolean(prefKey, expectedValue);
-		boolean foundValue = node.getBoolean(prefKey, true);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		if ("bogus".equals(originalString))
-			node.remove(prefKey);
-		else
-			node.put(prefKey, originalString);
-	}
-
-	private void pluginSetPreferenceString(IEclipsePreferences node, String prefKey) {
-		String originalValue = node.get(prefKey, "bogus");
-		String expectedValue = Long.toString(System.currentTimeMillis()); // random
-		// string
-		node.put(prefKey, expectedValue);
-		String foundValue = node.get(prefKey, "");
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		if ("bogus".equals(originalValue))
-			node.remove(prefKey);
-		else
-			node.put(prefKey, originalValue);
-	}
-
-	/**
-	 * Tests line delimiter preferences by making sure document created
-	 * follows line delimiter preference.
-	 */
-	public void testDelimiterPreferences() {
-		// check if content type preferences match
-		String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForHTML.ContentTypeID_HTML);
-		Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForHTML.ContentTypeID_HTML);
-		String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
-		assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
-		// set a particular line delimiter
-		prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
-		// create document
-		HTMLDocumentLoader loader = new HTMLDocumentLoader();
-		IEncodedDocument document = loader.createNewStructuredDocument();
-		String documentDelimiter = document.getPreferredLineDelimiter();
-
-		// verify delimiter in document matches preference
-		assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
-		// return to original preference
-		prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
-	}
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLTagInfoTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLTagInfoTest.java
deleted file mode 100644
index 35fa6614c..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/misc/HTMLTagInfoTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.misc;
-
-import org.eclipse.wst.html.core.tests.parser.ModelTest;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class HTMLTagInfoTest extends ModelTest {
-
-	public HTMLTagInfoTest(String name) {
-		super(name);
-	}
-
-	public HTMLTagInfoTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new HTMLTagInfoTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element html = document.createElement("HTML"); //$NON-NLS-1$
-			document.appendChild(html);
-			checkElementTagInfo(html);
-
-			Element body = document.createElement("BODY"); //$NON-NLS-1$
-			html.appendChild(body);
-			checkElementTagInfo(body);
-
-			Attr onclick = document.createAttribute("onclick"); //$NON-NLS-1$
-			body.setAttributeNode(onclick);
-			checkAttributeTagInfo(body, onclick);
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-	}
-
-	private void checkElementTagInfo(Element node) {
-		// check taginfo
-		CMElementDeclaration elementDecl = getCMElementDeclaration(node);
-		assertNotNull("Cannot check taginfo because no cm element declaration for " + node.getNodeName(), elementDecl); //$NON-NLS-1$
-		if (elementDecl != null) {
-			String tagInfo = (String) elementDecl.getProperty("tagInfo"); //$NON-NLS-1$
-			assertNotNull("No taginfo found for " + elementDecl.getNodeName(), tagInfo); //$NON-NLS-1$
-		}
-	}
-
-	private void checkAttributeTagInfo(Element element, Attr attribute) {
-		// check taginfo
-		CMElementDeclaration elementDecl = getCMElementDeclaration(element);
-		assertNotNull("Cannot check taginfo because no element declaration for " + element.getNodeName(), elementDecl); //$NON-NLS-1$
-		if (elementDecl != null) {
-			CMAttributeDeclaration attDecl = getCMAttributeDeclaration(elementDecl, attribute.getName());
-			assertNotNull("Cannot check taginfo because no attribute declaration for " + attribute.getName(), attDecl); //$NON-NLS-1$
-
-			String tagInfo = (String) attDecl.getProperty("tagInfo"); //$NON-NLS-1$
-			assertNull("Unexpected taginfo found for " + attDecl.getNodeName(), tagInfo); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Retreives CMAttributeDeclaration indicated by attribute name within
-	 * elementDecl
-	 */
-	private CMAttributeDeclaration getCMAttributeDeclaration(CMElementDeclaration elementDecl, String attName) {
-		CMAttributeDeclaration attrDecl = null;
-
-		if (elementDecl != null) {
-			CMNamedNodeMap attributes = elementDecl.getAttributes();
-			String noprefixName = DOMNamespaceHelper.getUnprefixedName(attName);
-			if (attributes != null) {
-				attrDecl = (CMAttributeDeclaration) attributes.getNamedItem(noprefixName);
-				if (attrDecl == null) {
-					attrDecl = (CMAttributeDeclaration) attributes.getNamedItem(attName);
-				}
-			}
-		}
-		return attrDecl;
-	}
-
-	/**
-	 * Retreives CMElementDeclaration for given node
-	 * 
-	 * @return CMElementDeclaration - CMElementDeclaration of node or
-	 *         <code>null</code> if not possible
-	 */
-	private CMElementDeclaration getCMElementDeclaration(Element element) {
-		CMElementDeclaration result = null;
-
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-		if (modelQuery != null)
-			result = modelQuery.getCMElementDeclaration(element);
-		return result;
-	}
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/BUG124835SetStyleAttributeValueTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/BUG124835SetStyleAttributeValueTest.java
deleted file mode 100644
index 949e59f3f..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/BUG124835SetStyleAttributeValueTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.eclipse.wst.html.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.contentmodel.PropCMProperty;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.tests.utils.FileUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-import org.w3c.dom.css.ElementCSSInlineStyle;
-
-public class BUG124835SetStyleAttributeValueTest extends TestCase {
-	/**
-	 * Tests setting some css attribute values including setting the same
-	 * value several times for different attributes
-	 */
-	public void testSetAttributeValue() {
-		final String ABSOLUTE = "absolute";
-		final String ONE = "1";
-		final String PX = "50px";
-
-		IDOMModel model = FileUtil.createHTMLModel();
-		try {
-			IDOMDocument doc = model.getDocument();
-			Element element = doc.createElement(HTML40Namespace.ElementName.DIV);
-			element.setAttribute(HTML40Namespace.ATTR_NAME_ID, "Layer0");
-			element.setAttribute(HTML40Namespace.ATTR_NAME_STYLE, "");
-			setInlineStyle(element, PropCMProperty.P_POSITION, ABSOLUTE);
-			setInlineStyle(element, PropCMProperty.P_Z_INDEX, ONE);
-			setInlineStyle(element, PropCMProperty.P_WIDTH, PX);
-			setInlineStyle(element, PropCMProperty.P_HEIGHT, PX);
-			setInlineStyle(element, PropCMProperty.P_TOP, PX);
-			setInlineStyle(element, PropCMProperty.P_LEFT, PX);
-
-			assertEquals(ABSOLUTE, getInlineStyle(element, PropCMProperty.P_POSITION));
-			assertEquals(ONE, getInlineStyle(element, PropCMProperty.P_Z_INDEX));
-			assertEquals(PX, getInlineStyle(element, PropCMProperty.P_WIDTH));
-			assertEquals(PX, getInlineStyle(element, PropCMProperty.P_HEIGHT));
-			assertEquals(PX, getInlineStyle(element, PropCMProperty.P_TOP));
-			assertEquals(PX, getInlineStyle(element, PropCMProperty.P_LEFT));
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	private void setInlineStyle(Element element, String name, String value) {
-		ICSSStyleDeclaration decl = null;
-		try {
-			decl = (ICSSStyleDeclaration) ((ElementCSSInlineStyle) element).getStyle();
-		}
-		catch (ClassCastException ex) {
-			// do nothing
-		}
-		if (decl != null) {
-			String priority = decl.getPropertyPriority(name);
-			decl.setProperty(name, value, priority);
-		}
-	}
-
-
-	private String getInlineStyle(Element element, String name) {
-		String value = null;
-		ICSSStyleDeclaration decl = null;
-		try {
-			decl = (ICSSStyleDeclaration) ((ElementCSSInlineStyle) element).getStyle();
-		}
-		catch (ClassCastException ex) {
-			// do nothing
-		}
-		if (decl != null) {
-			value = decl.getPropertyValue(name);
-		}
-		return value;
-	}
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/GetOverrideStyleTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/GetOverrideStyleTest.java
deleted file mode 100644
index 71d12ac34..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/GetOverrideStyleTest.java
+++ /dev/null
@@ -1,57 +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.html.core.tests.model;
-
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.tests.utils.FileUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.css.DocumentCSS;
-
-public class GetOverrideStyleTest extends TestCase {
-	/**
-	 * Constructor for StyleTest.
-	 * 
-	 * @param name
-	 */
-	public GetOverrideStyleTest(String name) {
-		super(name);
-	}
-
-	public GetOverrideStyleTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new GetOverrideStyleTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = FileUtil.createHTMLModel(); 
-		try {
-			model.getStructuredDocument().setText(null, "<style>p {	border-color: blue; margin: 0; } </style> <p style=\"border-color: red; margin: 1;\">");
-			Document document = model.getDocument();
-
-			DocumentCSS ddd = (DocumentCSS) document;
-			NodeList n = document.getElementsByTagName("p");
-			ddd.getOverrideStyle((Element) n.item(0), "");
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/ModelModifications.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/ModelModifications.java
deleted file mode 100644
index 768776297..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/ModelModifications.java
+++ /dev/null
@@ -1,304 +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.html.core.tests.model;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.tests.utils.TestWriter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.encoding.util.NullInputStream;
-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.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-
-public class ModelModifications extends TestCase {
-
-	public void testPlainDocument() throws BadLocationException {
-		IDocument document = new Document();
-		document.set("");
-		document.replace(0, 0, "test");
-		document.set("");
-		document.replace(0, 0, "test2");
-		assertTrue(true);
-
-	}
-
-	public void testRepDocumentHTMLMods() throws UnsupportedEncodingException, IOException {
-		IDOMModel model = null; // assumes 0-byte html empty file
-
-		model = createHTMLModel();
-
-		try {
-			IDOMDocument doc = model.getDocument();
-			Element ele = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele);
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "<tag>text</tag>");
-			Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele2);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testSetDocumentXMLMods() throws UnsupportedEncodingException, IOException {
-		IDOMModel model = null; // assumes 0-byte html empty file
-
-		model = createXMLModel();
-
-		try {
-			IDOMDocument doc = model.getDocument();
-			Element ele = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele);
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			structuredDocument.setText(this, "");
-			Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele2);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testRepDocumentJSPMods() throws UnsupportedEncodingException, IOException {
-		IDOMModel model = null; // assumes 0-byte html empty file
-
-		model = createJSPModel();
-
-		try {
-			IDOMDocument doc = model.getDocument();
-			Element ele = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele);
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "<tag>text</tag>");
-			Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele2);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testSetDocumentHTMLMods() throws UnsupportedEncodingException, IOException {
-		IDOMModel model = null; // assumes 0-byte html empty file
-
-		model = createHTMLModel();
-
-		try {
-			IDOMDocument doc = model.getDocument();
-			Element ele = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele);
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			structuredDocument.setText(this, "");
-			Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele2);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testSetDocumentJSPMods() throws UnsupportedEncodingException, IOException {
-		IDOMModel model = null; // assumes 0-byte html empty file
-
-		model = createJSPModel();
-
-		try {
-			IDOMDocument doc = model.getDocument();
-			Element ele = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele);
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			structuredDocument.setText(this, "");
-			Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele2);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testRepDocumentXMLMods() throws UnsupportedEncodingException, IOException {
-		IDOMModel model = null; // assumes 0-byte html empty file
-
-		model = createXMLModel();
-
-		try {
-			IDOMDocument doc = model.getDocument();
-			Element ele = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele);
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "<tag>text</tag>");
-			Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele2);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testDocumentHTMLMods() throws UnsupportedEncodingException, IOException {
-		IDOMModel model = null; // assumes 0-byte html empty file
-	
-		model = createHTMLModel();
-	
-		try {
-			IDOMDocument doc = model.getDocument();
-			Element ele = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele);
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "");
-			Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele2);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testDocumentJSPMods() throws UnsupportedEncodingException, IOException {
-		IDOMModel model = null; // assumes 0-byte html empty file
-	
-		model = createJSPModel();
-	
-		try {
-			IDOMDocument doc = model.getDocument();
-			Element ele = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele);
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "");
-			Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele2);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testDocumentXMLMods() throws UnsupportedEncodingException, IOException {
-		IDOMModel model = null; // assumes 0-byte html empty file
-	
-		model = createXMLModel();
-	
-		try {
-			IDOMDocument doc = model.getDocument();
-			Element ele = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele);
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			structuredDocument.replaceText(this, 0, structuredDocument.getLength(), "");
-			Element ele2 = doc.createElement(HTML40Namespace.ElementName.P);
-			doc.appendChild(ele2);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	/**
-	 * Be sure to release any models obtained from this method.
-	 * 
-	 * @return
-	 * @throws IOException 
-	 * @throws UnsupportedEncodingException 
-	 */
-	private static IDOMModel createXMLModel() throws UnsupportedEncodingException, IOException {
-
-		IStructuredModel model = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-
-		model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
-
-		// always use the same line delimiter for these tests, regardless
-		// of
-		// plaform or preference settings
-		model.getStructuredDocument().setLineDelimiter(TestWriter.commonEOL);
-		return (IDOMModel) model;
-
-	}
-
-	/**
-	 * Be sure to release any models obtained from this method.
-	 * 
-	 * @return
-	 * @throws IOException
-	 * @throws UnsupportedEncodingException
-	 */
-	private static IDOMModel createHTMLModel() throws UnsupportedEncodingException, IOException {
-
-		IStructuredModel model = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-
-		model = modelManager.getModelForEdit("test.html", new NullInputStream(), null);
-
-		// always use the same line delimiter for these tests, regardless
-		// of
-		// plaform or preference settings
-		model.getStructuredDocument().setLineDelimiter(TestWriter.commonEOL);
-		return (IDOMModel) model;
-
-	}
-
-	/**
-	 * Be sure to release any models obtained from this method.
-	 * 
-	 * @return
-	 * @throws IOException
-	 * @throws UnsupportedEncodingException
-	 */
-	private static IDOMModel createJSPModel() throws UnsupportedEncodingException, IOException {
-
-		IStructuredModel model = null;
-
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-
-		model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
-
-		// always use the same line delimiter for these tests, regardless
-		// of
-		// plaform or preference settings
-		model.getStructuredDocument().setLineDelimiter(TestWriter.commonEOL);
-
-
-		return (IDOMModel) model;
-
-	}
-
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/TestForNPEInCSSCreation.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/TestForNPEInCSSCreation.java
deleted file mode 100644
index 597a34139..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/model/TestForNPEInCSSCreation.java
+++ /dev/null
@@ -1,91 +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.html.core.tests.model;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.css.core.internal.provisional.adapters.IStyleSheetAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-import org.eclipse.wst.html.core.tests.utils.FileUtil;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-public class TestForNPEInCSSCreation extends TestCase {
-
-
-	public void testCSSModel() {
-
-		IDOMModel model = FileUtil.createHTMLModel();
-
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			structuredDocument.set(getHTMLDocumentText());
-
-			IDOMDocument doc = model.getDocument();
-
-			// get head tag
-			NodeList list = doc.getElementsByTagName(HTML40Namespace.ElementName.HEAD);
-			Element head = (Element) list.item(0);
-
-			// create and append style element
-			Element ele = doc.createElement(HTML40Namespace.ElementName.STYLE);
-			ele.setAttribute(HTML40Namespace.ATTR_NAME_TYPE, "text/css");
-
-			String delim = model.getStructuredDocument().getLineDelimiter();
-			if (delim == null)
-				delim = "\n";//$NON-NLS-1$
-			StringBuffer buffer = new StringBuffer(delim);
-			buffer.append("<!--");//$NON-NLS-1$
-			buffer.append(delim);
-			buffer.append("-->");//$NON-NLS-1$
-			buffer.append(delim);
-			Text text = doc.createTextNode(buffer.toString());
-			ele.appendChild(text);
-
-			head.insertBefore(ele, null);
-
-			// get adapter for StyleSheet
-			ICSSStyleSheet sheet = (ICSSStyleSheet) ((IStyleSheetAdapter) ((INodeNotifier) ele).getAdapterFor(IStyleSheetAdapter.class)).getSheet();
-
-			// create style declaration
-			ICSSStyleRule rule = sheet.createCSSStyleRule();
-			rule.getStyle().setProperty("background-color", "lime", "");
-			rule.getStyle().setProperty("background-color", "blue", "");
-			rule.getStyle().setProperty("background-color", "#0080ff", "");
-
-			//model.save();
-
-
-		}
-
-
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-
-	}
-
-	private String getHTMLDocumentText() {
-		return "<html><head></head><body></body></html>";
-	}
-
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AllModelParserTests.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AllModelParserTests.java
deleted file mode 100644
index 0ed2256c9..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AllModelParserTests.java
+++ /dev/null
@@ -1,152 +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.html.core.tests.parser;
-
-
-import junit.framework.TestSuite;
-
-
-public class AllModelParserTests {
-
-	//	public AllModelParserTests(String name) {
-	//		//super(name);
-	//	}
-
-	public void holdOldTestMain() {
-		runTest(new ParserTest());
-		runTest(new ParserTest2());
-		runTest(new ParserTest3());
-		runTest(new ParserTest4());
-		runTest(new UpdaterTest());
-		runTest(new UpdaterTest2());
-		runTest(new UpdaterTest3());
-		runTest(new UpdaterTest4());
-		runTest(new UpdaterTest5());
-		runTest(new UpdaterTest6());
-		runTest(new UpdaterTest7());
-		runTest(new UpdaterTest8());
-		runTest(new UpdaterTest9());
-		runTest(new UpdaterTest10());
-		runTest(new UpdaterTest11());
-		runTest(new UpdaterTest12());
-		runTest(new UpdaterTest13());
-		runTest(new UpdaterTest14());
-		runTest(new ElementTest());
-		runTest(new ElementTest2());
-		runTest(new ElementTest3());
-		runTest(new TableTest());
-		runTest(new TextTest());
-		runTest(new TextTest2());
-		runTest(new TextTest3());
-		runTest(new SplitTextTest());
-		runTest(new SplitTextTest2());
-		runTest(new SplitTextTest3());
-		runTest(new SplitTextTest4());
-		runTest(new SplitTextTest5());
-		runTest(new SplitTextTest6());
-		runTest(new SplitTextTest7());
-		runTest(new SplitTextTest8());
-		runTest(new EmptyTextTest());
-		runTest(new EmptyTextTest2());
-		runTest(new EmptyTextTest3());
-		runTest(new AttrTest());
-		runTest(new AttrTest2());
-		runTest(new EntityTest());
-		runTest(new EntityTest2());
-		runTest(new EntityTest3());
-		runTest(new EntityTest4());
-		runTest(new EntityTest5());
-		runTest(new EntityTest6());
-		runTest(new EntityTest7());
-		runTest(new EntityTest8());
-		runTest(new EntityTest9());
-		runTest(new DocTypeTest());
-		runTest(new CDATASectionTest());
-		runTest(new CDATASectionTest2());
-		runTest(new CDATASectionTest3());
-		runTest(new PITest());
-	}
-
-	public static TestSuite getAllTests() {
-
-
-		TestSuite testSuite = new TestSuite();
-
-		testSuite.addTestSuite(ParserTest.class);
-		testSuite.addTestSuite(ParserTest2.class);
-		testSuite.addTestSuite(ParserTest3.class);
-		testSuite.addTestSuite(ParserTest4.class);
-		testSuite.addTestSuite(UpdaterTest.class);
-		testSuite.addTestSuite(UpdaterTest2.class);
-		testSuite.addTestSuite(UpdaterTest3.class);
-		testSuite.addTestSuite(UpdaterTest4.class);
-		testSuite.addTestSuite(UpdaterTest5.class);
-		testSuite.addTestSuite(UpdaterTest6.class);
-		testSuite.addTestSuite(UpdaterTest7.class);
-		testSuite.addTestSuite(UpdaterTest8.class);
-		testSuite.addTestSuite(UpdaterTest9.class);
-		testSuite.addTestSuite(UpdaterTest10.class);
-		testSuite.addTestSuite(UpdaterTest11.class);
-		testSuite.addTestSuite(UpdaterTest12.class);
-		testSuite.addTestSuite(UpdaterTest13.class);
-		testSuite.addTestSuite(UpdaterTest14.class);
-		testSuite.addTestSuite(ElementTest.class);
-		testSuite.addTestSuite(ElementTest2.class);
-		testSuite.addTestSuite(ElementTest3.class);
-		testSuite.addTestSuite(TableTest.class);
-		testSuite.addTestSuite(TextTest.class);
-		testSuite.addTestSuite(TextTest2.class);
-		testSuite.addTestSuite(TextTest3.class);
-		testSuite.addTestSuite(SplitTextTest.class);
-		testSuite.addTestSuite(SplitTextTest2.class);
-		testSuite.addTestSuite(SplitTextTest3.class);
-		testSuite.addTestSuite(SplitTextTest4.class);
-		testSuite.addTestSuite(SplitTextTest5.class);
-		testSuite.addTestSuite(SplitTextTest6.class);
-		testSuite.addTestSuite(SplitTextTest7.class);
-		testSuite.addTestSuite(SplitTextTest8.class);
-		testSuite.addTestSuite(EmptyTextTest.class);
-		testSuite.addTestSuite(EmptyTextTest2.class);
-		testSuite.addTestSuite(EmptyTextTest3.class);
-		testSuite.addTestSuite(AttrTest.class);
-		testSuite.addTestSuite(AttrTest2.class);
-		testSuite.addTestSuite(EntityTest.class);
-		testSuite.addTestSuite(EntityTest2.class);
-		testSuite.addTestSuite(EntityTest3.class);
-		testSuite.addTestSuite(EntityTest4.class);
-		testSuite.addTestSuite(EntityTest5.class);
-		testSuite.addTestSuite(EntityTest6.class);
-		testSuite.addTestSuite(EntityTest7.class);
-		testSuite.addTestSuite(EntityTest8.class);
-		testSuite.addTestSuite(EntityTest9.class);
-		testSuite.addTestSuite(DocTypeTest.class);
-		testSuite.addTestSuite(CDATASectionTest.class);
-		testSuite.addTestSuite(CDATASectionTest2.class);
-		testSuite.addTestSuite(CDATASectionTest3.class);
-		testSuite.addTestSuite(PITest.class);
-		// the follow is fairly long running
-		//testSuite.addTestSuite(TestExampleFiles.class);
-
-		return testSuite;
-	}
-
-
-
-	private void runTest(ModelTest test) {
-		try {
-			test.testModel();
-		}
-		catch (Exception ex) {
-			ModelTest.printException(ex);
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest.java
deleted file mode 100644
index 1e713e834..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest.java
+++ /dev/null
@@ -1,50 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class AttrTest extends ModelTest {
-	/**
-	 * Constructor for AttrTest.
-	 * 
-	 * @param name
-	 */
-	public AttrTest(String name) {
-		super(name);
-	}
-
-	public AttrTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new AttrTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			//Document document = model.getDocument();
-
-			structuredDocument.setText(this, "<a href=\"<%=c%>\">a</a>");
-
-			printSource(model);
-			printTree(model);
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest2.java
deleted file mode 100644
index 8dbef6aed..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest2.java
+++ /dev/null
@@ -1,77 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class AttrTest2 extends ModelTest {
-	/**
-	 * Constructor for AttrTest2.
-	 * 
-	 * @param name
-	 */
-	public AttrTest2(String name) {
-		super(name);
-	}
-
-	public AttrTest2() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new AttrTest2().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			a.setAttribute("b", "c");
-			a.setAttribute("d", "e");
-			Text t = document.createTextNode("f");
-			document.appendChild(a);
-			a.appendChild(t);
-
-			printSource(model);
-			printTree(model);
-
-			Attr b = a.getAttributeNode("b");
-			b.setPrefix("x");
-
-			fOutputWriter.writeln("b.name=" + b.getName());
-			fOutputWriter.writeln("b.value=" + b.getValue());
-			String ab = a.getAttribute("b");
-			fOutputWriter.writeln("a b=" + ab);
-			String axb = a.getAttribute("x:b");
-			fOutputWriter.writeln("a x:b=" + axb);
-
-			printSource(model);
-			printTree(model);
-
-			a.getAttributeNode("d").setPrefix("y");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest3.java
deleted file mode 100644
index 7630665c4..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/AttrTest3.java
+++ /dev/null
@@ -1,67 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class AttrTest3 extends ModelTest {
-	/**
-	 * Constructor for AttrTest3.
-	 * 
-	 * @param name
-	 */
-	public AttrTest3(String name) {
-		super(name);
-	}
-
-	public AttrTest3() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new AttrTest3().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			Document document = model.getDocument();
-
-			structuredDocument.setText(this, "<a xmlns='default-uri' xmlns:b='b-uri'><c d='d-value' b:e='e-value'/></a>");
-
-			printSource(model);
-			printTree(model);
-
-			Element a = (Element) document.getFirstChild();
-			Element c = (Element) a.getFirstChild();
-
-			Attr xmlns = a.getAttributeNode("xmlns");
-			fOutputWriter.writeln("xmlns [" + xmlns.getNamespaceURI() + "]");
-			Attr xmlns_b = a.getAttributeNode("xmlns:b");
-			fOutputWriter.writeln("xmlns:b [" + xmlns_b.getNamespaceURI() + "]");
-			Attr d = c.getAttributeNode("d");
-			fOutputWriter.writeln("d [" + d.getNamespaceURI() + "]");
-			Attr b_e = c.getAttributeNode("b:e");
-			fOutputWriter.writeln("b:e [" + b_e.getNamespaceURI() + "]");
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest.java
deleted file mode 100644
index 64e8c889e..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest.java
+++ /dev/null
@@ -1,64 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class CDATASectionTest extends ModelTest {
-	/**
-	 * Constructor for CDATASectionTest.
-	 * 
-	 * @param name
-	 */
-	public CDATASectionTest(String name) {
-		super(name);
-	}
-
-	public CDATASectionTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new CDATASectionTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-
-			structuredDocument.setText(this, "<a><![CDATA[contentOfCDATASection]]></a>");
-
-			printSource(model);
-			printTree(model);
-
-			Node a = document.getFirstChild();
-			for (Node child = a.getFirstChild(); child != null; child = child.getNextSibling()) {
-				if (child.getNodeType() != Node.CDATA_SECTION_NODE)
-					continue;
-				CDATASection cdata = (CDATASection) child;
-				fOutputWriter.writeln(cdata.getData());
-			}
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest2.java
deleted file mode 100644
index bb476623f..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest2.java
+++ /dev/null
@@ -1,74 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class CDATASectionTest2 extends ModelTest {
-	/**
-	 * Constructor for CDATASectionTest2.
-	 * 
-	 * @param name
-	 */
-	public CDATASectionTest2(String name) {
-		super(name);
-	}
-
-	public CDATASectionTest2() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new CDATASectionTest2().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			document.appendChild(a);
-			CDATASection cdata = document.createCDATASection("contentOfCDATASection");
-			a.appendChild(cdata);
-
-			printSource(model);
-			printTree(model);
-
-			fOutputWriter.writeln(cdata.getData());
-
-			cdata.setData("new content");
-
-
-			printSource(model);
-			printTree(model);
-
-			fOutputWriter.writeln(cdata.getData());
-
-			cdata.setData("new content");
-
-			printSource(model);
-			printTree(model);
-
-			fOutputWriter.writeln(cdata.getData());
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest3.java
deleted file mode 100644
index 3e014cd5e..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/CDATASectionTest3.java
+++ /dev/null
@@ -1,74 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class CDATASectionTest3 extends ModelTest {
-	/**
-	 * Constructor for CDATASectionTest3.
-	 * 
-	 * @param name
-	 */
-	public CDATASectionTest3(String name) {
-		super(name);
-	}
-
-	public CDATASectionTest3() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new CDATASectionTest3().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			document.appendChild(a);
-			CDATASection cdata = document.createCDATASection("contentOfCDATASection");
-			a.appendChild(cdata);
-
-			printSource(model);
-			printTree(model);
-
-			fOutputWriter.writeln(cdata.getData());
-
-			cdata.setData("new < content");
-
-
-			printSource(model);
-			printTree(model);
-
-			fOutputWriter.writeln(cdata.getData());
-
-			cdata.setData("new > content");
-
-			printSource(model);
-			printTree(model);
-
-			fOutputWriter.writeln(cdata.getData());
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/DocTypeTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/DocTypeTest.java
deleted file mode 100644
index 4aede0361..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/DocTypeTest.java
+++ /dev/null
@@ -1,71 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocumentType;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Element;
-
-public class DocTypeTest extends ModelTest {
-	/**
-	 * Constructor for DocTypeTest.
-	 * 
-	 * @param name
-	 */
-	public DocTypeTest(String name) {
-		super(name);
-	}
-
-	public DocTypeTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new DocTypeTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			IDOMDocument document = model.getDocument();
-
-			IDOMDocumentType docType = (IDOMDocumentType) document.createDoctype("HTML");
-			document.appendChild(docType);
-			Element html = document.createElement("HTML");
-			document.appendChild(html);
-
-			printSource(model);
-			printTree(model);
-
-			docType.setSystemId("sytem");
-
-			printSource(model);
-			printTree(model);
-
-			docType.setPublicId("public");
-
-			printSource(model);
-			printTree(model);
-
-			document.insertBefore(document.createTextNode(" "), docType);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest.java
deleted file mode 100644
index 6cf7cad05..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest.java
+++ /dev/null
@@ -1,85 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-public class ElementTest extends ModelTest {
-	/**
-	 * Constructor for ElementTest.
-	 * 
-	 * @param name
-	 */
-	public ElementTest(String name) {
-		super(name);
-	}
-
-	public ElementTest() {
-		super();
-	}
-
-	public Element changeTagName(Element element, String tagName) {
-		Document document = element.getOwnerDocument();
-		Node parent = element.getParentNode();
-		Element newElement = document.createElement(tagName);
-		NamedNodeMap attributes = element.getAttributes();
-		while (attributes.getLength() > 0) {
-			Attr attr = (Attr) attributes.item(0);
-			attr = element.removeAttributeNode(attr);
-			newElement.setAttributeNode(attr);
-		}
-		while (element.hasChildNodes()) {
-			Node child = element.getFirstChild();
-			child = element.removeChild(child);
-			newElement.appendChild(child);
-		}
-		parent.insertBefore(newElement, element);
-		parent.removeChild(element);
-		return newElement;
-	}
-
-	public static void main(java.lang.String[] args) {
-		new ElementTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			Document document = model.getDocument();
-
-			structuredDocument.replaceText(null, 0, 0, "<a><b e=\"f\" c=\"d\"><g /><h /></b></a>");
-			Node a = document.getFirstChild();
-			Element b = (Element) a.getFirstChild();
-
-			printSource(model);
-			printTree(model);
-
-			//Element i =
-			changeTagName(b, "i");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest2.java
deleted file mode 100644
index 23f1a75cb..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest2.java
+++ /dev/null
@@ -1,70 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class ElementTest2 extends ModelTest {
-	/**
-	 * Constructor for ElementTest2.
-	 * 
-	 * @param name
-	 */
-	public ElementTest2(String name) {
-		super(name);
-	}
-
-	public ElementTest2() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new ElementTest2().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			Element b = document.createElement("b");
-			Text t = document.createTextNode("c");
-			document.appendChild(a);
-			a.appendChild(b);
-			b.appendChild(t);
-
-			printSource(model);
-			printTree(model);
-
-			a.setPrefix("x");
-
-			fOutputWriter.writeln("a.tagName=" + a.getTagName());
-
-			printSource(model);
-			printTree(model);
-
-			b.setPrefix("y");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest3.java
deleted file mode 100644
index 71f465b64..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ElementTest3.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class ElementTest3 extends ModelTest {
-	/**
-	 * Constructor for ElementTest3.
-	 * 
-	 * @param name
-	 */
-	public ElementTest3(String name) {
-		super(name);
-	}
-
-	public ElementTest3() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new ElementTest3().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("x:a");
-			Element b = document.createElement("b");
-			Text t = document.createTextNode("c");
-			document.appendChild(a);
-			a.appendChild(b);
-			b.appendChild(t);
-
-			printSource(model);
-			printTree(model);
-
-			a.setPrefix("");
-
-			fOutputWriter.writeln("a.tagName=" + a.getTagName());
-
-			printSource(model);
-			printTree(model);
-
-			a.setPrefix("y");
-
-			fOutputWriter.writeln("a.tagName=" + a.getTagName());
-
-			printSource(model);
-			printTree(model);
-
-			a.setPrefix("y");
-
-			printSource(model);
-			printTree(model);
-
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest.java
deleted file mode 100644
index f50cbf75f..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest.java
+++ /dev/null
@@ -1,76 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EmptyTextTest extends ModelTest {
-	/**
-	 * Constructor for EmptyTextTest.
-	 * 
-	 * @param name
-	 */
-	public EmptyTextTest(String name) {
-		super(name);
-	}
-
-	public EmptyTextTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EmptyTextTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("a");
-			p.appendChild(text);
-			Element br = document.createElement("BR");
-			p.appendChild(br);
-			Text text2 = document.createTextNode("");
-			p.appendChild(text2);
-
-			printSource(model);
-			printTree(model);
-
-			Text text3 = document.createTextNode("");
-			p.insertBefore(text3, text2);
-
-			printSource(model);
-			printTree(model);
-
-			text3.setData("b");
-
-			printSource(model);
-			printTree(model);
-
-			p.removeChild(text2);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest2.java
deleted file mode 100644
index f3006450b..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest2.java
+++ /dev/null
@@ -1,79 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EmptyTextTest2 extends ModelTest {
-	/**
-	 * Constructor for EmptyTextTest2.
-	 * 
-	 * @param name
-	 */
-	public EmptyTextTest2(String name) {
-		super(name);
-	}
-
-	public EmptyTextTest2() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EmptyTextTest2().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			text.setData("a");
-
-			printSource(model);
-			printTree(model);
-
-			text.setData("");
-
-			printSource(model);
-			printTree(model);
-
-			Element b = document.createElement("B");
-			p.appendChild(b);
-			p.removeChild(text);
-			b.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			text.setData("a");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest3.java
deleted file mode 100644
index 49dfb7a40..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EmptyTextTest3.java
+++ /dev/null
@@ -1,60 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EmptyTextTest3 extends ModelTest {
-	/**
-	 * Constructor for EmptyTextTest3.
-	 * 
-	 * @param name
-	 */
-	public EmptyTextTest3(String name) {
-		super(name);
-	}
-
-	public EmptyTextTest3() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EmptyTextTest3().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Text text = document.createTextNode("");
-			document.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			Element a = document.createElement("a");
-			document.insertBefore(a, text);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest.java
deleted file mode 100644
index 6deb9cf7c..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest.java
+++ /dev/null
@@ -1,60 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest extends ModelTest {
-	/**
-	 * Constructor for EntityTest.
-	 * 
-	 * @param name
-	 */
-	public EntityTest(String name) {
-		super(name);
-	}
-
-	public EntityTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EntityTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-
-			printSource(model);
-			printTree(model);
-
-			Text text = document.createTextNode("&gt;");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest2.java
deleted file mode 100644
index 7bb1459b0..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest2.java
+++ /dev/null
@@ -1,62 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest2 extends ModelTest {
-	/**
-	 * Constructor for EntityTest2.
-	 * 
-	 * @param name
-	 */
-	public EntityTest2(String name) {
-		super(name);
-	}
-
-	public EntityTest2() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EntityTest2().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("a");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			text.setData("a&gt;");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest3.java
deleted file mode 100644
index 12591e707..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest3.java
+++ /dev/null
@@ -1,82 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest3 extends ModelTest {
-	/**
-	 * Constructor for EntityTest3.
-	 * 
-	 * @param name
-	 */
-	public EntityTest3(String name) {
-		super(name);
-	}
-
-	public EntityTest3() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EntityTest3().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("a");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			text.setData("ab");
-
-			printSource(model);
-			printTree(model);
-
-			text.setData("ab&");
-
-			printSource(model);
-			printTree(model);
-
-			text.setData("ab&c");
-
-			printSource(model);
-			printTree(model);
-
-			text.setData("dab&c");
-
-			printSource(model);
-			printTree(model);
-
-			text.setData("dab&ce");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest4.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest4.java
deleted file mode 100644
index 5f1744c16..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest4.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies 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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest4 extends ModelTest {
-	/**
-	 * Constructor for EntityTest4.
-	 * 
-	 * @param name
-	 */
-	public EntityTest4(String name) {
-		super(name);
-	}
-
-	public EntityTest4() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EntityTest4().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("a&b");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			Text text2 = document.createTextNode("");
-			p.insertBefore(text2, text);
-
-			printSource(model);
-			printTree(model);
-
-			text2.setData("c");
-
-			printSource(model);
-			printTree(model);
-
-			text2.setData("ca&b");
-
-			printSource(model);
-			printTree(model);
-
-			p.removeChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest5.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest5.java
deleted file mode 100644
index 5d6e2692b..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest5.java
+++ /dev/null
@@ -1,63 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest5 extends ModelTest {
-	/**
-	 * Constructor for EntityTest5.
-	 * 
-	 * @param name
-	 */
-	public EntityTest5(String name) {
-		super(name);
-	}
-
-	public EntityTest5() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EntityTest5().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("a&b");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			Text text2 = document.createTextNode("a&b");
-			p.insertBefore(text2, text);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest6.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest6.java
deleted file mode 100644
index c55a9c20c..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest6.java
+++ /dev/null
@@ -1,63 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class EntityTest6 extends ModelTest {
-	/**
-	 * Constructor for EntityTest6.
-	 * 
-	 * @param name
-	 */
-	public EntityTest6(String name) {
-		super(name);
-	}
-
-	public EntityTest6() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EntityTest6().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("a&");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			Text text2 = document.createTextNode("a&");
-			p.insertBefore(text2, text);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest7.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest7.java
deleted file mode 100644
index 4a092d033..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest7.java
+++ /dev/null
@@ -1,53 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class EntityTest7 extends ModelTest {
-	/**
-	 * Constructor for EntityTest7.
-	 * 
-	 * @param name
-	 */
-	public EntityTest7(String name) {
-		super(name);
-	}
-
-	public EntityTest7() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EntityTest7().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			//Document document = model.getDocument();
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-
-			structuredDocument.setText(this, "<a>a&#65;&#x41;&unk;&unk&unk</a>");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest8.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest8.java
deleted file mode 100644
index b22f9389c..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest8.java
+++ /dev/null
@@ -1,53 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class EntityTest8 extends ModelTest {
-	/**
-	 * Constructor for EntityTest8.
-	 * 
-	 * @param name
-	 */
-	public EntityTest8(String name) {
-		super(name);
-	}
-
-	public EntityTest8() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EntityTest8().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			//Document document = model.getDocument();
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-
-			structuredDocument.setText(this, "&ibm;&rtp;");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest9.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest9.java
deleted file mode 100644
index a1eff8b36..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/EntityTest9.java
+++ /dev/null
@@ -1,63 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class EntityTest9 extends ModelTest {
-	/**
-	 * Constructor for EntityTest9.
-	 * 
-	 * @param name
-	 */
-	public EntityTest9(String name) {
-		super(name);
-	}
-
-	public EntityTest9() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new EntityTest9().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			//Document document = model.getDocument();
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-
-			structuredDocument.setText(this, "&lt;");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(this, 4, 0, "&gt");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(this, 7, 0, ";");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ModelTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ModelTest.java
deleted file mode 100644
index d59cfe7c2..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ModelTest.java
+++ /dev/null
@@ -1,291 +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.html.core.tests.parser;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Writer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.tests.utils.DateUtil;
-import org.eclipse.wst.html.core.tests.utils.FileUtil;
-import org.eclipse.wst.html.core.tests.utils.StringCompareUtil;
-import org.eclipse.wst.html.core.tests.utils.TestWriter;
-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.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.document.StructuredDocumentRegionChecker;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-
-public abstract class ModelTest extends TestCase {
-
-	public final static String testResultsDirectoryPrefix = "ParserResults";
-	private final static String fileExtension = ".txt";
-	protected TestWriter fOutputWriter = new TestWriter();
-	private int READ_BUFFER_SIZE = 4096;
-
-	private boolean echoToSystemOut = false;
-	private boolean printedOnce;
-	private boolean printSummaryToSystemOut;
-
-	/**
-	 * Constructor for ModelTest.
-	 * 
-	 * @param name
-	 */
-	public ModelTest(String name) {
-		super(name);
-		try {
-			printClass();
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public ModelTest() {
-		this("dummy");
-		//		try {
-		//			printClass();
-		//		} catch (IOException e) {
-		//			e.printStackTrace();
-		//		}
-	}
-
-	public static IDOMModel createHTMLModel() {
-
-		//return new XMLModelImpl();
-
-		IStructuredModel model = null;
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-
-			model = modelManager.getModelForEdit("test.html", new NullInputStream(), null);
-
-			// always use the same line delimiter for these tests, regardless
-			// of
-			// plaform or preference settings
-			model.getStructuredDocument().setLineDelimiter(TestWriter.commonEOL);
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		//assertTrue("basic XML empty model could not be created", model !=
-		// null);
-		return (IDOMModel) model;
-
-	}
-
-	public static IDOMModel createXMLModel() {
-
-		//return new XMLModelImpl();
-
-		IStructuredModel model = null;
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			//assertTrue("modelManager must not be null", modelManager !=
-			// null);
-
-			model = modelManager.getModelForEdit("test.xml", new NullInputStream(), null);
-
-			// always use the same line delimiter for these tests, regardless
-			// of
-			// plaform or preference settings
-			model.getStructuredDocument().setLineDelimiter(TestWriter.commonEOL);
-
-
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		//assertTrue("basic XML empty model could not be created", model !=
-		// null);
-		return (IDOMModel) model;
-
-	}
-
-	/**
-	 */
-	private void printClass() throws IOException {
-		fOutputWriter.writeln(getClass().getName());
-	}
-
-	public static void printException(Exception ex) {
-		ex.printStackTrace();
-	}
-
-	private void printNode(Node node, int indent) {
-		try {
-			StringBuffer buffer = new StringBuffer(10);
-			for (int i = 0; i < indent; i++)
-				buffer.append("--");
-			buffer.append(StringUtils.escape(node.toString()));
-			fOutputWriter.writeln(buffer.toString());
-			indent++;
-			Node child = node.getFirstChild();
-			while (child != null) {
-				printNode(child, indent);
-				child = child.getNextSibling();
-			}
-		}
-		catch (Exception ex) {
-			printException(ex);
-		}
-	}
-
-	public void printSource(IDOMModel model) {
-		try {
-			fOutputWriter.writeln("Source :");
-			fOutputWriter.writeln(model.getStructuredDocument().getText());
-			fOutputWriter.writeln("");
-		}
-		catch (Exception ex) {
-			printException(ex);
-		}
-	}
-
-	public void printTree(IDOMModel model) {
-		try {
-			printFlatModel(model.getStructuredDocument());
-			new StructuredDocumentRegionChecker(fOutputWriter).checkModel(model);
-			fOutputWriter.writeln("Tree :");
-			printNode(model.getDocument(), 0);
-			fOutputWriter.writeln("");
-
-		}
-		catch (Exception ex) {
-			printException(ex);
-		}
-
-	}
-
-	protected void saveAndCompareTestResults() {
-		try {
-			String testOutputDirectory = testResultsDirectoryPrefix + DateUtil.now();
-			String currentFilename = getClass().getName() + fileExtension;
-			File fileout = FileUtil.makeFileFor(testOutputDirectory, currentFilename, testResultsDirectoryPrefix);
-			Writer fileWriter = new FileWriter(fileout);
-			fileWriter.write(fOutputWriter.toString());
-			fileWriter.close();
-			compareWithPreviousResults(fOutputWriter, currentFilename);
-
-			if (echoToSystemOut) {
-				System.out.println(fOutputWriter.toString());
-			}
-
-			fOutputWriter.close();
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Method compareWithPreviousResults.
-	 * 
-	 * @param outputWriter
-	 * @param currentFilename
-	 */
-	private void compareWithPreviousResults(TestWriter outputWriter, String currentFilename) throws IOException {
-		boolean success = false;
-		File previousResultsDir = FileUtil.getPreviousResultsDirectory(testResultsDirectoryPrefix);
-		if (previousResultsDir != null) {
-			String currentResults = outputWriter.toString();
-			File previousResultsFile = new File(previousResultsDir, currentFilename);
-			FileReader previousResultsFileReader = new FileReader(previousResultsFile);
-			String previousResults = readString(previousResultsFileReader);
-			StringCompareUtil stringCompare = new StringCompareUtil();
-			// trying to "force" the same linedelimter didn't work well,
-			// I think since the line delimiter is input on some tests,
-			// and CVS is likely to change anyway (for ASCII files).
-			// so we'll ignore in our comparisons. Note: we wouldn't
-			// want to ignore whitespace. There might actually be some
-			// tests that are not as accurate if we ignore EOL, but there
-			// seems to be no easy way to handle, with out a lot of trouble.
-			if (!stringCompare.equalsIgnoreLineSeperator(previousResults, currentResults)) {
-				// previousResults.equals(currentResults)) {
-				// fail
-				success = false;
-
-				System.out.println();
-				System.out.println(currentFilename + " failed comparison to previous results");
-				System.out.println("Previous: ");
-				System.out.println(previousResults);
-				System.out.println();
-				System.out.println("Current: ");
-				System.out.println(currentResults);
-				System.out.println();
-			}
-			else {
-				success = true;
-				if (printSummaryToSystemOut) {
-					System.out.println();
-					System.out.println(currentFilename + " compared ok");
-					System.out.println();
-				}
-			}
-		}
-		else {
-			if (!printedOnce) {
-				System.out.println();
-				System.out.println("No Previous Directory found ... couldn't compare " + currentFilename + " with previous results");
-				printedOnce = true;
-				System.out.println();
-			}
-		}
-		assertTrue("current is not equal to reference results for " + currentFilename, success);
-	}
-
-	/**
-	 * Method readString.
-	 * 
-	 * @param previousResultsFileReader
-	 * @return String
-	 */
-	private String readString(FileReader fileReader) throws IOException {
-		return readInputStream(fileReader);
-	}
-
-	private String readInputStream(InputStreamReader inputStreamReader) throws IOException {
-		int numRead = 0;
-		StringBuffer buffer = new StringBuffer();
-		char tBuff[] = new char[READ_BUFFER_SIZE];
-		while ((numRead = inputStreamReader.read(tBuff, 0, tBuff.length)) != -1) {
-			buffer.append(tBuff, 0, numRead);
-		}
-		// remember -- we didn't open stream ... so we don't close it
-		return buffer.toString();
-	}
-
-	public abstract void testModel();
-
-	protected void printFlatModel(IStructuredDocument flatModel) {
-		fOutputWriter.writeln("");
-		fOutputWriter.writeln("StructuredDocument Regions :");
-		IStructuredDocumentRegion flatnode = flatModel.getFirstStructuredDocumentRegion();
-		while (flatnode != null) {
-
-			fOutputWriter.writeln(flatnode.toString());
-			flatnode = flatnode.getNext();
-
-		}
-		fOutputWriter.writeln("");
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NodeListTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NodeListTest.java
deleted file mode 100644
index e5f4b16d8..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NodeListTest.java
+++ /dev/null
@@ -1,142 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class NodeListTest extends ModelTest {
-	/**
-	 * Constructor for PITest.
-	 * 
-	 * @param name
-	 */
-	public NodeListTest(String name) {
-		super(name);
-	}
-
-	public NodeListTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new NodeListTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-
-			structuredDocument.setText(this, "<p></p>");
-			Node parent = document.getFirstChild();
-
-			for (int i = 0; i < 1; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-
-			for (int i = 1; i < 5; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-
-			for (int i = 5; i < 10; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-
-			for (int i = 10; i < 20; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-
-			for (int i = 20; i < 50; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-
-			for (int i = 50; i < 100; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-
-			for (int i = 100; i < 200; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-
-			for (int i = 200; i < 500; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-
-			for (int i = 500; i < 1000; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-
-			for (int i = 1000; i < 2000; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-
-			for (int i = 2000; i < 5000; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-
-			for (int i = 5000; i < 10000; i++) {
-				parent.appendChild(document.createElement("c"));
-			}
-
-			iterate(parent);
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-
-	private void iterate(Node parent) {
-		long start = System.currentTimeMillis();
-		int i = 0;
-		int t = 0;
-		while (t < 1000) {
-			NodeList childNodes = parent.getChildNodes();
-			int length = childNodes.getLength();
-			for (i = 0; i < length; i++) {
-				childNodes.item(i);
-			}
-			// these 2 lines are required to invalidate the cache
-			parent.appendChild(parent.getOwnerDocument().createTextNode(""));
-			parent.removeChild(parent.getLastChild());
-			t++;
-		}
-		float d = ((float) (System.currentTimeMillis() - start)) / t;
-		System.out.println(d + " ms for " + i + " child nodes");
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NullInputStream.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NullInputStream.java
deleted file mode 100644
index e4810c3d9..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/NullInputStream.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.parser;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-
-class NullInputStream extends InputStream {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#mark(int)
-	 */
-	public synchronized void mark(int readlimit) {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#markSupported()
-	 */
-	public boolean markSupported() {
-		// we can mark nothing.
-		// and, we are using this Null class specifically for
-		// a "fake" resettable stream.
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#read()
-	 */
-	public int read() throws IOException {
-
-		return -1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#reset()
-	 */
-	public synchronized void reset() throws IOException {
-		// nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.io.InputStream#skip(long)
-	 */
-	public long skip(long n) throws IOException {
-		return 0;
-	}
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/PITest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/PITest.java
deleted file mode 100644
index ce72a8d26..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/PITest.java
+++ /dev/null
@@ -1,70 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-
-public class PITest extends ModelTest {
-	/**
-	 * Constructor for PITest.
-	 * 
-	 * @param name
-	 */
-	public PITest(String name) {
-		super(name);
-	}
-
-	public PITest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new PITest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-
-			structuredDocument.setText(this, "<a><?echo $PHP_SELF?></a>");
-
-			printSource(model);
-			printTree(model);
-
-			Node a = document.getFirstChild();
-			for (Node child = a.getFirstChild(); child != null; child = child.getNextSibling()) {
-				if (child.getNodeType() != Node.PROCESSING_INSTRUCTION_NODE)
-					continue;
-				ProcessingInstruction pi = (ProcessingInstruction) child;
-				String target = pi.getTarget();
-				if (target == null)
-					target = "null";
-				String data = pi.getData();
-				if (data == null)
-					data = "null";
-				fOutputWriter.writeln("target(" + target + ") data (" + data + ")");
-			}
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest.java
deleted file mode 100644
index d1d9b9c04..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest.java
+++ /dev/null
@@ -1,102 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class ParserTest extends ModelTest {
-	/**
-	 * Constructor for ParserTest.
-	 * 
-	 * @param name
-	 */
-	public ParserTest(String name) {
-		super(name);
-	}
-
-	public ParserTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new ParserTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			Document document = model.getDocument();
-
-			structuredDocument.replaceText(null, 0, 0, "<P><B></B><B></B></P><P></P>");
-			Node p = document.getFirstChild();
-			Node b = p.getFirstChild();
-			Node b2 = b.getNextSibling();
-			Node p2 = p.getNextSibling();
-			/*
-			 * Element p = document.createElement("P");
-			 * document.appendChild(p); Element b =
-			 * document.createElement("B"); p.appendChild(b); Element b2 =
-			 * document.createElement("B"); p.appendChild(b2); Element p2 =
-			 * document.createElement("P"); document.appendChild(p2);
-			 */
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, 0, 0, "a");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, ((IDOMNode) b).getStartOffset(), 0, "b");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, ((IDOMNode) b2).getStartOffset(), 0, "c");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, ((IDOMNode) b2).getEndOffset(), 0, "d");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, ((IDOMNode) p2).getStartOffset(), 0, "e");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, ((IDOMNode) p2).getStartOffset() + 3, 0, "f");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, ((IDOMNode) p2).getEndOffset(), 0, "g");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest2.java
deleted file mode 100644
index 2790ba33d..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest2.java
+++ /dev/null
@@ -1,93 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-public class ParserTest2 extends ModelTest {
-	/**
-	 * Constructor for ParserTest2.
-	 * 
-	 * @param name
-	 */
-	public ParserTest2(String name) {
-		super(name);
-	}
-
-	public ParserTest2() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new ParserTest2().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			Document document = model.getDocument();
-
-			structuredDocument.replaceText(null, 0, 0, "<a b=\"\"  c=\"c\">");
-
-			printSource(model);
-			printTree(model);
-
-			Element a = (Element) document.getFirstChild();
-			NamedNodeMap attributes = a.getAttributes();
-			for (int i = 0; i < attributes.getLength(); i++) {
-				Node attr = attributes.item(i);
-				String name = attr.getNodeName();
-				String value = attr.getNodeValue();
-				fOutputWriter.writeln(name + "=[" + value + "]");
-			}
-
-			structuredDocument.replaceText(null, 8, 0, "d");
-
-			printSource(model);
-			printTree(model);
-
-			a = (Element) document.getFirstChild();
-			attributes = a.getAttributes();
-			for (int i = 0; i < attributes.getLength(); i++) {
-				Node attr = attributes.item(i);
-				String name = attr.getNodeName();
-				String value = attr.getNodeValue();
-				fOutputWriter.writeln(name + "=[" + value + "]");
-			}
-
-			structuredDocument.replaceText(null, 8, 1, "");
-
-			printSource(model);
-			printTree(model);
-
-			a = (Element) document.getFirstChild();
-			attributes = a.getAttributes();
-			for (int i = 0; i < attributes.getLength(); i++) {
-				Node attr = attributes.item(i);
-				String name = attr.getNodeName();
-				String value = attr.getNodeValue();
-				fOutputWriter.writeln(name + "=[" + value + "]");
-			}
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest3.java
deleted file mode 100644
index be59eb676..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest3.java
+++ /dev/null
@@ -1,89 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-public class ParserTest3 extends ModelTest {
-	/**
-	 * Constructor for ParserTest3.
-	 * 
-	 * @param name
-	 */
-	public ParserTest3(String name) {
-		super(name);
-	}
-
-	public ParserTest3() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new ParserTest3().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			Document document = model.getDocument();
-
-			//StructuredDocumentEvent event =
-			structuredDocument.replaceText(null, 0, 0, "<a b  >");
-			// dont's print instance of event, or many tests will fail when
-			// event class is changed (exactly what is not needed for unit
-			// tests!)
-			// fOutputWriter.writeln(event.toString());
-
-			printSource(model);
-			printTree(model);
-
-			Element a = (Element) document.getFirstChild();
-			NamedNodeMap attributes = a.getAttributes();
-			for (int i = 0; i < attributes.getLength(); i++) {
-				Node attr = attributes.item(i);
-				String name = attr.getNodeName();
-				String value = attr.getNodeValue();
-				fOutputWriter.writeln(name + "=[" + value + "]");
-			}
-
-			StructuredDocumentEvent event2 = structuredDocument.replaceText(null, 4, 1, "");
-			// I removed this part of output, since renaming class or package
-			// will cause test to fail!
-			fOutputWriter.writeln(event2.toString());
-
-			printSource(model);
-			printTree(model);
-
-			a = (Element) document.getFirstChild();
-			attributes = a.getAttributes();
-			for (int i = 0; i < attributes.getLength(); i++) {
-				Node attr = attributes.item(i);
-				String name = attr.getNodeName();
-				String value = attr.getNodeValue();
-				fOutputWriter.writeln(name + "=[" + value + "]");
-			}
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest4.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest4.java
deleted file mode 100644
index 4d6e60c29..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/ParserTest4.java
+++ /dev/null
@@ -1,84 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class ParserTest4 extends ModelTest {
-	/**
-	 * Constructor for ParserTest4.
-	 * 
-	 * @param name
-	 */
-	public ParserTest4(String name) {
-		super(name);
-	}
-
-	public ParserTest4() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new ParserTest4().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			//Document document = model.getDocument();
-
-			structuredDocument.replaceText(null, 0, 0, "<a>\n\n<% a %>\n<% b %>\n</a>");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, 4, 0, "<");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, 5, 0, "b");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, 6, 0, "c");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, 7, 0, "d");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, 8, 0, "e");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, 9, 0, ">");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest.java
deleted file mode 100644
index 7b4d018ef..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest.java
+++ /dev/null
@@ -1,112 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
-import org.eclipse.wst.xml.core.internal.document.SourceValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Text;
-
-public class SourceTest extends ModelTest {
-	/**
-	 * Constructor for SourceTest.
-	 * 
-	 * @param name
-	 */
-	public SourceTest(String name) {
-		super(name);
-	}
-
-	public SourceTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new SourceTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Text t = document.createTextNode("t");
-			document.appendChild(t);
-			SourceValidator validator = new SourceValidator(t);
-
-			String source = null;
-			String result = null;
-
-			source = "aaa<bbb>ccc";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			source = "aaa&amp;\"'bbb&gt;&lt;ccc&quot;&#64;";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			source = "&amp;&&";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			source = "&bbb&<>ccc";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			source = "&unk;&unk";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest2.java
deleted file mode 100644
index 96bbec3ce..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest2.java
+++ /dev/null
@@ -1,115 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
-import org.eclipse.wst.xml.core.internal.document.SourceValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class SourceTest2 extends ModelTest {
-	/**
-	 * Constructor for SourceTest2.
-	 * 
-	 * @param name
-	 */
-	public SourceTest2(String name) {
-		super(name);
-	}
-
-	public SourceTest2() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new SourceTest2().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			Attr b = document.createAttribute("b");
-			a.setAttributeNode(b);
-			document.appendChild(a);
-			SourceValidator validator = new SourceValidator(b);
-
-			String source = null;
-			String result = null;
-
-			source = "aaa<bbb>ccc";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			source = "aaa&amp;bbb&gt;&lt;ccc&quot;&#64;";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			source = "&amp;&&";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			source = "\"aaa\"";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			source = "\"a'a\"";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest3.java
deleted file mode 100644
index 3d9fa8400..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SourceTest3.java
+++ /dev/null
@@ -1,93 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
-import org.eclipse.wst.xml.core.internal.document.SourceValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class SourceTest3 extends ModelTest {
-	/**
-	 * Constructor for SourceTest3.
-	 * 
-	 * @param name
-	 */
-	public SourceTest3(String name) {
-		super(name);
-	}
-
-	public SourceTest3() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new SourceTest3().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			Attr b = document.createAttribute("b");
-			a.setAttributeNode(b);
-			document.appendChild(a);
-			SourceValidator validator = new SourceValidator(b);
-
-			String source = null;
-			String result = null;
-
-			source = "<% aaa %><%= bbb %>/<%! ccc %>ddd";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			source = "<% aaa";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			source = ">< % aaa %>";
-			fOutputWriter.writeln("source: " + source);
-			try {
-				validator.validateSource(source);
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-			result = validator.convertSource(source);
-			fOutputWriter.writeln("result: " + result);
-
-			saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest.java
deleted file mode 100644
index efb9deb09..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest.java
+++ /dev/null
@@ -1,87 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest extends ModelTest {
-	/**
-	 * Constructor for SplitTextTest.
-	 * 
-	 * @param name
-	 */
-	public SplitTextTest(String name) {
-		super(name);
-	}
-
-	public SplitTextTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new SplitTextTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("aabbbbccc");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			Text text2 = text.splitText(2);
-
-			printSource(model);
-			printTree(model);
-
-			Text text3 = text2.splitText(4);
-
-			printSource(model);
-			printTree(model);
-
-			p.removeChild(text2);
-
-			printSource(model);
-			printTree(model);
-
-			text.appendData("ddddddd");
-
-			printSource(model);
-			printTree(model);
-
-			text3.appendData("eee");
-
-			printSource(model);
-			printTree(model);
-
-			p.insertBefore(text2, text3);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest2.java
deleted file mode 100644
index fc09d0cd3..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest2.java
+++ /dev/null
@@ -1,79 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest2 extends ModelTest {
-	/**
-	 * Constructor for SplitTextTest2.
-	 * 
-	 * @param name
-	 */
-	public SplitTextTest2(String name) {
-		super(name);
-	}
-
-	public SplitTextTest2() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new SplitTextTest2().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("aabbbbccc");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			Text text2 = text.splitText(2);
-
-			printSource(model);
-			printTree(model);
-
-			Text text3 = text2.splitText(4);
-
-			printSource(model);
-			printTree(model);
-
-			p.removeChild(text2);
-
-			printSource(model);
-			printTree(model);
-
-			Element b = document.createElement("B");
-			b.appendChild(text2);
-			p.insertBefore(b, text3);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest3.java
deleted file mode 100644
index 9eb3cc121..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest3.java
+++ /dev/null
@@ -1,81 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest3 extends ModelTest {
-	/**
-	 * Constructor for SplitTextTest3.
-	 * 
-	 * @param name
-	 */
-	public SplitTextTest3(String name) {
-		super(name);
-	}
-
-	public SplitTextTest3() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new SplitTextTest3().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("aa");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			Element b = document.createElement("B");
-			Text text2 = document.createTextNode("bbbb");
-			b.appendChild(text2);
-			p.appendChild(b);
-
-			printSource(model);
-			printTree(model);
-
-			Text text3 = document.createTextNode("ccc");
-			p.appendChild(text3);
-
-			printSource(model);
-			printTree(model);
-
-			p.removeChild(b);
-
-			printSource(model);
-			printTree(model);
-
-			p.insertBefore(b, text3);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest4.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest4.java
deleted file mode 100644
index e7eb96ce2..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest4.java
+++ /dev/null
@@ -1,79 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest4 extends ModelTest {
-	/**
-	 * Constructor for SplitTextTest4.
-	 * 
-	 * @param name
-	 */
-	public SplitTextTest4(String name) {
-		super(name);
-	}
-
-	public SplitTextTest4() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new SplitTextTest4().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			text.appendData("aaa");
-
-			printSource(model);
-			printTree(model);
-
-			text.deleteData(0, 3);
-
-			printSource(model);
-			printTree(model);
-
-			Text text2 = document.createTextNode("cccc");
-			p.insertBefore(text2, text);
-
-			printSource(model);
-			printTree(model);
-
-			text.appendData("aaa");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest5.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest5.java
deleted file mode 100644
index 37861f4ea..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest5.java
+++ /dev/null
@@ -1,94 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest5 extends ModelTest {
-	/**
-	 * Constructor for SplitTextTest5.
-	 * 
-	 * @param name
-	 */
-	public SplitTextTest5(String name) {
-		super(name);
-	}
-
-	public SplitTextTest5() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new SplitTextTest5().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("aabbbbccc");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			Text text2 = text.splitText(6);
-
-			printSource(model);
-			printTree(model);
-
-			Element br = document.createElement("BR");
-			p.insertBefore(br, text2);
-
-			printSource(model);
-			printTree(model);
-
-			text2.setData("cccd");
-
-			printSource(model);
-			printTree(model);
-
-			text2.setData("cccde");
-
-			printSource(model);
-			printTree(model);
-
-			Text text3 = text.splitText(2);
-			Element b = document.createElement("B");
-			b.appendChild(text3);
-			p.insertBefore(b, br);
-
-			printSource(model);
-			printTree(model);
-
-			Text text4 = text2.splitText(3);
-			Element i = document.createElement("I");
-			i.appendChild(text2);
-			p.insertBefore(i, text4);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest6.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest6.java
deleted file mode 100644
index 165f429ae..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest6.java
+++ /dev/null
@@ -1,65 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest6 extends ModelTest {
-	/**
-	 * Constructor for SplitTextTest6.
-	 * 
-	 * @param name
-	 */
-	public SplitTextTest6(String name) {
-		super(name);
-	}
-
-	public SplitTextTest6() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new SplitTextTest6().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("aabbbbccc");
-			p.appendChild(text);
-			Text text2 = text.splitText(2);
-			// ==> // Text text3 =
-			text2.splitText(4);
-
-			printSource(model);
-			printTree(model);
-
-			text2.setData("bbbbd");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest7.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest7.java
deleted file mode 100644
index 31ab275ba..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest7.java
+++ /dev/null
@@ -1,66 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest7 extends ModelTest {
-	/**
-	 * Constructor for SplitTextTest7.
-	 * 
-	 * @param name
-	 */
-	public SplitTextTest7(String name) {
-		super(name);
-	}
-
-	public SplitTextTest7() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new SplitTextTest7().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("aaaa");
-			Text text2 = document.createTextNode("bbbb");
-			p.appendChild(text);
-			p.appendChild(text2);
-
-			printSource(model);
-			printTree(model);
-
-
-			// delete accross node boundry
-			model.getStructuredDocument().replaceText(this, 6, 3, "");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest8.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest8.java
deleted file mode 100644
index 2a94e4410..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/SplitTextTest8.java
+++ /dev/null
@@ -1,66 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class SplitTextTest8 extends ModelTest {
-	/**
-	 * Constructor for SplitTextTest8.
-	 * 
-	 * @param name
-	 */
-	public SplitTextTest8(String name) {
-		super(name);
-	}
-
-	public SplitTextTest8() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new SplitTextTest8().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Text text = document.createTextNode("aaaa");
-			Text text2 = document.createTextNode("bbbb");
-			p.appendChild(text);
-			p.appendChild(text2);
-
-			printSource(model);
-			printTree(model);
-
-
-			// delete accross node boundry
-			model.getStructuredDocument().replaceText(this, 4, 6, "");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TableTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TableTest.java
deleted file mode 100644
index 02851e78a..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TableTest.java
+++ /dev/null
@@ -1,85 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class TableTest extends ModelTest {
-	/**
-	 * Constructor for TableTest.
-	 * @param name
-	 */
-	public TableTest(String name) {
-		super(name);
-	}
-
-	public TableTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new TableTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-		Document document = model.getDocument();
-
-		Element html = document.createElement("HTML");
-		document.appendChild(html);
-
-		printSource(model);
-		printTree(model);
-
-		Element body = document.createElement("BODY");
-		html.appendChild(body);
-
-		printSource(model);
-		printTree(model);
-
-		Element table = document.createElement("TABLE");
-		table.setAttribute("border", "1");
-		Element td = null;
-		for (int row = 0; row < 2; row++) {
-			Element tr = document.createElement("TR");
-			table.appendChild(tr);
-			for (int col = 0; col < 2; col++) {
-				td = document.createElement("TD");
-				tr.appendChild(td);
-			}
-		}
-		body.appendChild(table);
-
-		printSource(model);
-		printTree(model);
-
-		Element font = document.createElement("FONT");
-		font.setAttribute("color", "red");
-		Text text = document.createTextNode("text");
-		font.appendChild(text);
-		td.appendChild(font);
-
-		printSource(model);
-		printTree(model);
-
-		saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest.java
deleted file mode 100644
index 125ac1983..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest.java
+++ /dev/null
@@ -1,61 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class TextTest extends ModelTest {
-	/**
-	 * Constructor for TextTest.
-	 * 
-	 * @param name
-	 */
-	public TextTest(String name) {
-		super(name);
-	}
-
-	public TextTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new TextTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			document.appendChild(a);
-			CharacterData text = document.createTextNode("text");
-			a.appendChild(text);
-
-			text.setData("hello &lt;");
-
-			printSource(model);
-			printTree(model);
-
-			fOutputWriter.writeln(text.getData());
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest2.java
deleted file mode 100644
index 593e61a1d..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest2.java
+++ /dev/null
@@ -1,61 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class TextTest2 extends ModelTest {
-	/**
-	 * Constructor for TextTest2.
-	 * 
-	 * @param name
-	 */
-	public TextTest2(String name) {
-		super(name);
-	}
-
-	public TextTest2() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new TextTest2().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			document.appendChild(a);
-			CharacterData text = document.createTextNode("text");
-			a.appendChild(text);
-
-			text.setNodeValue("hello &lt;");
-
-			printSource(model);
-			printTree(model);
-
-			fOutputWriter.writeln(text.getNodeValue());
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest3.java
deleted file mode 100644
index ab5d11a57..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/TextTest3.java
+++ /dev/null
@@ -1,106 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class TextTest3 extends ModelTest {
-	/**
-	 * Constructor for TextTest3.
-	 * 
-	 * @param name
-	 */
-	public TextTest3(String name) {
-		super(name);
-	}
-
-	public TextTest3() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new TextTest3().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			document.appendChild(a);
-			IDOMNode text = (IDOMNode) document.createTextNode("text");
-			a.appendChild(text);
-
-			try {
-				text.setSource("hello <");
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-
-			printSource(model);
-			printTree(model);
-
-			try {
-				text.setSource("hello &lt;");
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-
-			printSource(model);
-			printTree(model);
-
-			try {
-				text.setSource("hello &unk;");
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-
-			printSource(model);
-			printTree(model);
-
-			try {
-				text.setSource("hello &#65;");
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-
-			printSource(model);
-			printTree(model);
-
-			try {
-				text.setSource("hello & good-bye");
-			}
-			catch (InvalidCharacterException ex) {
-				fOutputWriter.writeln(ex.getMessage());
-			}
-
-			printSource(model);
-			printTree(model);
-
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest.java
deleted file mode 100644
index 805965ef6..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest.java
+++ /dev/null
@@ -1,105 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest(String name) {
-		super(name);
-	}
-
-	public UpdaterTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element html = document.createElement("HTML");
-			document.appendChild(html);
-
-			printSource(model);
-			printTree(model);
-
-			Element body = document.createElement("BODY");
-			html.appendChild(body);
-
-			printSource(model);
-			printTree(model);
-
-			Element p = document.createElement("P");
-			body.appendChild(p);
-
-			printSource(model);
-			printTree(model);
-
-			Text text = document.createTextNode("text");
-			p.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			Element br = document.createElement("BR");
-			p.insertBefore(br, text);
-
-			printSource(model);
-			printTree(model);
-
-			Element img = document.createElement("IMG");
-			p.appendChild(img);
-
-			printSource(model);
-			printTree(model);
-
-			p.removeChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			p.insertBefore(text, img);
-
-			printSource(model);
-			printTree(model);
-
-			body.removeChild(p);
-
-			printSource(model);
-			printTree(model);
-
-			body.appendChild(p);
-
-			printSource(model);
-			printTree(model);
-
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest10.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest10.java
deleted file mode 100644
index d8b6a90f2..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest10.java
+++ /dev/null
@@ -1,112 +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.html.core.tests.parser;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class UpdaterTest10 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest10.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest10(String name) {
-		super(name);
-	}
-
-	public UpdaterTest10() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest10().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			document.appendChild(a);
-			a.setAttribute("b", "c");
-			Element b = document.createElement("b");
-			a.appendChild(b);
-
-			printSource(model);
-			printTree(model);
-
-			fOutputWriter.writeln("IStructuredDocumentRegion:");
-			IDOMNode node = (IDOMNode) b;
-			IStructuredDocumentRegion flatNode = node.getStartStructuredDocumentRegion();
-			fOutputWriter.writeln(flatNode.getText());
-			Iterator e = flatNode.getRegions().iterator();
-			int i = 0;
-			while (e.hasNext()) {
-				ITextRegion region = (ITextRegion) e.next();
-				boolean ok = true; // no longer has parent.
-								   // //(region.getParent() == flatNode);
-				fOutputWriter.writeln(i + "(" + flatNode.getText(region) + ")" + ok);
-			}
-			fOutputWriter.writeln("");
-
-			b.setAttribute("c", "d");
-
-			printSource(model);
-			printTree(model);
-
-			fOutputWriter.writeln("IStructuredDocumentRegion:");
-			node = (IDOMNode) b;
-			flatNode = node.getStartStructuredDocumentRegion();
-			fOutputWriter.writeln(flatNode.getText());
-			e = flatNode.getRegions().iterator();
-			i = 0;
-			while (e.hasNext()) {
-				ITextRegion region = (ITextRegion) e.next();
-				boolean ok = true; // no longer has parent.
-								   // (region.getParent() == flatNode);
-				fOutputWriter.writeln(i + "(" + flatNode.getText(region) + ")" + ok);
-			}
-			fOutputWriter.writeln("");
-
-			a.setAttribute("b", "cd");
-
-			printSource(model);
-			printTree(model);
-
-			fOutputWriter.writeln("IStructuredDocumentRegion:");
-			node = (IDOMNode) b;
-			flatNode = node.getStartStructuredDocumentRegion();
-			fOutputWriter.writeln(flatNode.getText());
-			e = flatNode.getRegions().iterator();
-			i = 0;
-			while (e.hasNext()) {
-				ITextRegion region = (ITextRegion) e.next();
-				boolean ok = true; // (region.getParent() == flatNode);
-				fOutputWriter.writeln(i + "(" + flatNode.getText(region) + ")" + ok);
-			}
-			fOutputWriter.writeln("");
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest11.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest11.java
deleted file mode 100644
index baf6fbbea..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest11.java
+++ /dev/null
@@ -1,62 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest11 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest11.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest11(String name) {
-		super(name);
-	}
-
-	public UpdaterTest11() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest11().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			document.appendChild(a);
-			Text text = document.createTextNode("b");
-			a.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			text.setData("b");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest12.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest12.java
deleted file mode 100644
index 1d313ac05..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest12.java
+++ /dev/null
@@ -1,64 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class UpdaterTest12 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest12.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest12(String name) {
-		super(name);
-	}
-
-	public UpdaterTest12() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest12().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			document.appendChild(a);
-
-			printSource(model);
-			printTree(model);
-
-			Element a2 = document.createElement("a");
-			document.insertBefore(a2, a);
-
-			printSource(model);
-			printTree(model);
-
-			document.removeChild(a2);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest13.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest13.java
deleted file mode 100644
index 81341762e..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest13.java
+++ /dev/null
@@ -1,66 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest13 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest13.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest13(String name) {
-		super(name);
-	}
-
-	public UpdaterTest13() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest13().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			Document document = model.getDocument();
-
-			structuredDocument.replaceText(null, 0, 0, "<a>\r\n<b>\r\n</a>");
-
-			Element a = (Element) document.getFirstChild();
-			Element b = (Element) a.getLastChild();
-			Text text = document.createTextNode("  ");
-			a.appendChild(text);
-
-			printSource(model);
-			printTree(model);
-
-			a.removeChild(b);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest14.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest14.java
deleted file mode 100644
index a27c9ea17..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest14.java
+++ /dev/null
@@ -1,58 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class UpdaterTest14 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest14.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest14(String name) {
-		super(name);
-	}
-
-	public UpdaterTest14() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest14().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			//Document document = model.getDocument();
-
-			structuredDocument.replaceText(null, 0, 0, "<%= aaaa %>");
-
-			printSource(model);
-			printTree(model);
-
-			structuredDocument.replaceText(null, 2, 0, " ");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest15.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest15.java
deleted file mode 100644
index 532b11c80..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest15.java
+++ /dev/null
@@ -1,64 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class UpdaterTest15 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest15.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest15(String name) {
-		super(name);
-	}
-
-	public UpdaterTest15() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest15().testModel();
-	}
-
-	public void testModel() {
-		// XML case
-		IDOMModel model = createXMLModel();
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			//Document document = model.getDocument();
-
-			structuredDocument.replaceText(null, 0, 0, "<%= aaaa %><P>");
-
-			printSource(model);
-			printTree(model);
-
-			//	HTML case
-			model = createHTMLModel();
-			structuredDocument = model.getStructuredDocument();
-			//document = model.getDocument();
-
-			structuredDocument.replaceText(null, 0, 0, "<%= aaaa %><P>");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest2.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest2.java
deleted file mode 100644
index 4b5da1c28..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest2.java
+++ /dev/null
@@ -1,77 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest2 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest2.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest2(String name) {
-		super(name);
-	}
-
-	public UpdaterTest2() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest2().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-			Document document = model.getDocument();
-
-			structuredDocument.setText(this, "<HTML>\r\n<HEAD></HEAD>\r\n<BODY></BODY>\r\n</HTML>\r\n");
-			Element html = (Element) document.getFirstChild();
-			Element head = (Element) html.getFirstChild().getNextSibling();
-
-			printSource(model);
-			printTree(model);
-
-			Element meta = document.createElement("META");
-			meta.setAttribute("name", "GENERATOR");
-			meta.setAttribute("content", "Updater Test 2");
-			head.appendChild(meta);
-			Text text4 = document.createTextNode("\r\n");
-			head.insertBefore(text4, meta);
-			Text text5 = document.createTextNode("\r\n");
-			head.appendChild(text5);
-
-			printSource(model);
-			printTree(model);
-
-			Element title = document.createElement("TITLE");
-			Text text6 = document.createTextNode("");
-			title.appendChild(text6);
-			head.appendChild(title);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest3.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest3.java
deleted file mode 100644
index 7e8fb76ea..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest3.java
+++ /dev/null
@@ -1,69 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest3 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest3.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest3(String name) {
-		super(name);
-	}
-
-	public UpdaterTest3() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest3().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			document.appendChild(a);
-			Element b = document.createElement("b");
-			a.appendChild(b);
-
-			printSource(model);
-			printTree(model);
-
-			Text t1 = document.createTextNode("\n");
-			a.insertBefore(t1, b);
-
-			printSource(model);
-			printTree(model);
-
-			Text t2 = document.createTextNode("\n");
-			a.appendChild(t2);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest4.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest4.java
deleted file mode 100644
index 964e56517..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest4.java
+++ /dev/null
@@ -1,62 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest4 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest4.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest4(String name) {
-		super(name);
-	}
-
-	public UpdaterTest4() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest4().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			document.appendChild(a);
-			Text t = document.createTextNode("b");
-			a.appendChild(t);
-
-			printSource(model);
-			printTree(model);
-
-			t.setData("b");
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest5.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest5.java
deleted file mode 100644
index c32e9f496..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest5.java
+++ /dev/null
@@ -1,63 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class UpdaterTest5 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest5.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest5(String name) {
-		super(name);
-	}
-
-	public UpdaterTest5() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest5().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-
-			structuredDocument.setText(this, "<a>&apos;</a>");
-
-			printSource(model);
-			printTree(model);
-
-			Node a = document.getFirstChild();
-			Node t = a.getFirstChild();
-			a.removeChild(t);
-			a.appendChild(t);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest6.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest6.java
deleted file mode 100644
index ca2839f68..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest6.java
+++ /dev/null
@@ -1,67 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest6 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest6.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest6(String name) {
-		super(name);
-	}
-
-	public UpdaterTest6() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest6().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element a = document.createElement("a");
-			document.appendChild(a);
-			Text t = document.createTextNode("b");
-			a.appendChild(t);
-
-			printSource(model);
-			printTree(model);
-
-			a.removeChild(t);
-
-			printSource(model);
-			printTree(model);
-
-			a.appendChild(t);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest7.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest7.java
deleted file mode 100644
index 2c041889b..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest7.java
+++ /dev/null
@@ -1,62 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class UpdaterTest7 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest7.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest7(String name) {
-		super(name);
-	}
-
-	public UpdaterTest7() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest7().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-			Element b = document.createElement("B");
-			p.appendChild(b);
-
-			printSource(model);
-			printTree(model);
-
-			Element b2 = document.createElement("B");
-			p.insertBefore(b2, b);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest8.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest8.java
deleted file mode 100644
index c54f47adb..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest8.java
+++ /dev/null
@@ -1,60 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class UpdaterTest8 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest8.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest8(String name) {
-		super(name);
-	}
-
-	public UpdaterTest8() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest8().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element p = document.createElement("P");
-			document.appendChild(p);
-
-			printSource(model);
-			printTree(model);
-
-			Element p2 = document.createElement("P");
-			document.appendChild(p2);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest9.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest9.java
deleted file mode 100644
index 92f9165c0..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTest9.java
+++ /dev/null
@@ -1,61 +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.html.core.tests.parser;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
-public class UpdaterTest9 extends ModelTest {
-	/**
-	 * Constructor for UpdaterTest9.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTest9(String name) {
-		super(name);
-	}
-
-	public UpdaterTest9() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTest9().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel();
-		try {
-			Document document = model.getDocument();
-
-			Element style = document.createElement("STYLE");
-			document.appendChild(style);
-
-			printSource(model);
-			printTree(model);
-
-			Text text2 = document.createTextNode("p");
-			style.appendChild(text2);
-
-			printSource(model);
-			printTree(model);
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTestRegionChanged.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTestRegionChanged.java
deleted file mode 100644
index 8ba3c2ec3..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/UpdaterTestRegionChanged.java
+++ /dev/null
@@ -1,73 +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.html.core.tests.parser;
-
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class UpdaterTestRegionChanged extends ModelTest {
-	/**
-	 * Constructor for UpdaterTestRegionChanged.
-	 * 
-	 * @param name
-	 */
-	public UpdaterTestRegionChanged(String name) {
-		super(name);
-	}
-
-	public UpdaterTestRegionChanged() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new UpdaterTestRegionChanged().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createXMLModel();
-		try {
-			Document document = model.getDocument();
-			IStructuredDocument structuredDocument = model.getStructuredDocument();
-
-			structuredDocument.setText(this, "<a b= c></a>");
-
-			Node before = document.getFirstChild();
-
-			StructuredDocumentEvent fmEvent = structuredDocument.replaceText(null, 5, 1, "");
-			if (fmEvent instanceof RegionChangedEvent) {
-				fOutputWriter.writeln("ok: RegionChangedEvent");
-			}
-			else {
-				fOutputWriter.writeln("not ok: " + fmEvent.getClass().getName());
-			}
-
-			Node after = document.getFirstChild();
-
-			if (before != after) {
-				fOutputWriter.writeln("not ok: Node replaced");
-			}
-			else {
-				fOutputWriter.writeln("ok: Node not replaced");
-			}
-
-			saveAndCompareTestResults();
-		}
-		finally {
-			model.releaseFromEdit();
-		}
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/css/StyleTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/css/StyleTest.java
deleted file mode 100644
index 29a582e0e..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/parser/css/StyleTest.java
+++ /dev/null
@@ -1,75 +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.html.core.tests.parser.css;
-
-import org.eclipse.wst.html.core.tests.parser.ModelTest;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-import org.w3c.dom.css.CSSStyleSheet;
-import org.w3c.dom.stylesheets.DocumentStyle;
-import org.w3c.dom.stylesheets.LinkStyle;
-import org.w3c.dom.stylesheets.StyleSheetList;
-
-public class StyleTest extends ModelTest {
-	/**
-	 * Constructor for StyleTest.
-	 * @param name
-	 */
-	public StyleTest(String name) {
-		super(name);
-	}
-
-	public StyleTest() {
-		super();
-	}
-
-	public static void main(java.lang.String[] args) {
-		new StyleTest().testModel();
-	}
-
-	public void testModel() {
-		IDOMModel model = createHTMLModel(); //new HTMLModelImpl();
-		Document document = model.getDocument();
-
-		Element style = document.createElement("STYLE");
-		Text text = document.createTextNode("BODY { color : red; } P { color : green; } B { color : blue; }");
-		style.appendChild(text);
-		document.appendChild(style);
-
-		printSource(model);
-		printTree(model);
-
-		DocumentStyle ds = (DocumentStyle) document;
-		StyleSheetList ssl = ds.getStyleSheets();
-		if (ssl.getLength() > 0) {
-			CSSStyleSheet ss = (CSSStyleSheet) ssl.item(0);
-			ss.deleteRule(1);
-		}
-
-		printSource(model);
-		printTree(model);
-
-		LinkStyle ls = (LinkStyle) style;
-		CSSStyleSheet ss2 = (CSSStyleSheet) ls.getSheet();
-		if (ss2 != null) {
-			ss2.deleteRule(0);
-		}
-
-		printSource(model);
-		printTree(model);
-
-		saveAndCompareTestResults();
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/StyleAdapterPerfTest.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/StyleAdapterPerfTest.java
deleted file mode 100644
index 622c92039..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/StyleAdapterPerfTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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:
- * 		Masaki Saitoh (MSAITOH@jp.ibm.com)
- *		See Bug 153000  Style Adapters should be lazier
- *		https://bugs.eclipse.org/bugs/show_bug.cgi?id=153000
- *
- *     
- *******************************************************************************/
-package org.eclipse.wst.html.core.tests.text;
-
-import org.eclipse.wst.html.core.internal.provisional.HTML40Namespace;
-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.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.stylesheets.LinkStyle;
-
-import junit.framework.TestCase;
-
-public class StyleAdapterPerfTest extends TestCase {
-
-	/**
-	 * criteria for "fail", in msecs
-	 */
-	private static final long MAX_EXPECTED_TIME = 4000;
-
-	public void testPerformance() {
-		try {
-			String filename = "testfiles/html/example04.html";
-			IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit(filename, getClass().getResourceAsStream(filename), null);
-			if (model instanceof IDOMModel) {
-				IDOMDocument doc = ((IDOMModel) model).getDocument();
-				NodeList nodes = doc.getElementsByTagName(HTML40Namespace.ElementName.STYLE);
-				if (nodes != null && nodes.getLength() > 0) {
-					Node node = nodes.item(0);
-					if (node instanceof LinkStyle) {
-						long start = System.currentTimeMillis();
-						((LinkStyle) node).getSheet();
-						// System.out.println("elapsed time = " + (System.currentTimeMillis() - start));
-						// TODO: we should probably use something likse o.e.core.runtime.PerformanceStats
-						// I picked the following fail criteria simple since before fix, the printlin reports about 7000 
-						// on my computer, but with fix, reported about 1000. 
-						// The appropriate time may vary greatly depending on the build/test machine. 
-						// This is just to catch some large change in behavior
-						long elapsedTime = System.currentTimeMillis() - start;
-						if (elapsedTime > MAX_EXPECTED_TIME) {
-							fail("getSheet took longer than expected the expected " + MAX_EXPECTED_TIME +"ms");
-						} 
-					}
-				}
-			}
-			if (model != null)
-				model.releaseFromRead();
-		}
-		catch (Exception e) {
-		}
-	}
-
-}
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/TestStructuredPartitionerHTML.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/TestStructuredPartitionerHTML.java
deleted file mode 100644
index fcde0d514..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/TestStructuredPartitionerHTML.java
+++ /dev/null
@@ -1,319 +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.html.core.tests.text;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-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.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredTextPartitioner;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-import com.ibm.icu.text.DecimalFormat;
-
-public class TestStructuredPartitionerHTML extends TestCase {
-
-	private boolean DEBUG_PRINT_RESULT = false;
-	protected ITypedRegion[] partitions = null;
-
-	private boolean useFormatter = true;
-	protected DecimalFormat formatter;
-
-	public TestStructuredPartitionerHTML(String name) {
-		super(name);
-		if (DEBUG_PRINT_RESULT && useFormatter)
-			formatter = new DecimalFormat();
-	}
-	
-	/**
-	 * must release model (from edit) after
-	 * @param filename relative to this class (TestStructuredPartitioner)
-	 */
-	private IStructuredModel getModelForEdit(String filename) {
-
-		IStructuredModel model = null;
-		try {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			InputStream inStream = getClass().getResourceAsStream(filename);
-			if (inStream == null)
-				inStream = new StringBufferInputStream("");
-			model = modelManager.getModelForEdit(filename, inStream, null);
-		}
-		catch (IOException ex) {
-			ex.printStackTrace();
-		}
-		return model;
-	}
-	
-	public void testDisconnectConnect() {
-		IStructuredModel model = null;
-		try {
-			model =getModelForEdit("testfiles/html/example01.xml");
-			if(model != null) {
-				IStructuredDocument sDoc = model.getStructuredDocument();
-				assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-			
-				IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-				assertTrue("partitioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-				
-				IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
-				assertNotNull("partitioner was null for sDoc:" + sDoc, partitioner);
-				try {
-					stp.disconnect();
-				}
-				catch(Exception e) {
-					assertTrue("problem disconnecting w/:" +sDoc + "/n" + e, false);
-				}
-				try {
-					stp.connect(sDoc);
-				}
-				catch(Exception e) {
-					assertTrue("problem connecting w/:" + sDoc + "/n" + e, false);
-				}
-			}
-			else {
-				assertTrue("could not retrieve structured model", false);
-			}
-		}
-		finally  {
-			if(model != null)
-				model.releaseFromEdit();
-		}	
-	}
-	
-	public void testGetDefaultPartitionType() {
-		IStructuredModel model = null;
-		try {
-			model =getModelForEdit("testfiles/html/example01.xml");
-			if(model != null) {
-				IStructuredDocument sDoc = model.getStructuredDocument();
-				assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-			
-				IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-				assertTrue("partitioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-				
-				IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
-				String defaultPartitionType = stp.getDefaultPartitionType();
-				assertTrue("wrong default partition type was: [" + defaultPartitionType + "] should be: [" + IXMLPartitions.XML_DEFAULT + "]", defaultPartitionType.equals(IXMLPartitions.XML_DEFAULT));
-			}
-			else {
-				assertTrue("could not retrieve structured model", false);
-			}
-		}
-		finally  {
-			if(model != null)
-				model.releaseFromEdit();
-		}	
-	}
-	
-	public void testGetPartitionType() {
-		IStructuredModel model = null;
-		try {
-			model =getModelForEdit("testfiles/html/example01.xml");
-			if(model != null) {
-				IStructuredDocument sDoc = model.getStructuredDocument();
-				assertTrue("sDoc implementation not instance of IDocumentExtension3", sDoc instanceof IDocumentExtension3);
-			
-				IDocumentPartitioner partitioner = ((IDocumentExtension3)sDoc).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING);
-				assertTrue("paritioner doesn't implement IStructuredTextPartitioner", partitioner instanceof IStructuredTextPartitioner);
-				
-				IStructuredTextPartitioner stp = (IStructuredTextPartitioner)partitioner;
-				String defaultPartitionType = stp.getDefaultPartitionType();
-				assertTrue("wrong default partition type was: [" + defaultPartitionType + "] should be: [" + IXMLPartitions.XML_DEFAULT + "]", defaultPartitionType.equals(IXMLPartitions.XML_DEFAULT));
-			}
-			else {
-				assertTrue("could not retrieve structured model", false);
-			}
-		}
-		finally  {
-			if(model != null)
-				model.releaseFromEdit();
-		}	
-	}
-	
-	public void testHTML1() throws IOException, BadLocationException {
-		int expectedPartitions = 4;
-		int nPartitions = doComputePartitioningTest("testfiles/html/example01.html");
-		assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DECLARATION, IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.HTML_COMMENT, IHTMLPartitions.HTML_DEFAULT});
-	}
-
-	public void testHTML2() throws IOException, BadLocationException {
-		int expectedPartitions = 7;
-		//TODO Nitin, we need to review the Unknown to Script change (8/1/03, 9:00PM)
-		int nPartitions = doComputePartitioningTest("testfiles/html/example02.html");
-		assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT, IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT, IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT, IHTMLPartitions.HTML_DEFAULT});
-	}
-
-	public void testHTML3() throws IOException, BadLocationException {
-		int expectedPartitions = 1;
-		String file = "testfiles/html/example03.html";
-		int nPartitions = doComputePartitioningTest(file);
-		assertTrue("wrong number of partitions", nPartitions == expectedPartitions);
-		checkSeams();
-		verifyPartitionTypes(partitions, new String[]{IHTMLPartitions.HTML_DEFAULT});
-
-		// 121 if CRLF
-		//  ITypedRegion scriptPartition = getPartitionTest(file, 121);
-		// 116 if LF or CR only
-		//  ITypedRegion scriptPartition = getPartitionTest(file, 121);
-
-		ITypedRegion part1 = getPartitionTest(file, 121);
-		ITypedRegion part2 = getPartitionTest(file, 116);
-
-//		assertEquals("partition is wrong type!", scriptPartition.getType(), IHTMLPartitions.ST_SCRIPT);
-		// the critical position is surrounded with HTML > 5 characters in either direction; this should be good enough
-		assertTrue("partition is wrong type! :(" + part1.getType() + "|" + part2.getType() + ")", part1.getType().equals(IHTMLPartitions.SCRIPT) || part2.getType().equals(IHTMLPartitions.SCRIPT));
-		assertTrue("partition is not zero length!", (part1.getLength() == 0 || part2.getLength() == 0));
-	}
-	
-	/**
-	 * Ensure that the current list of partitions are all adjacent to one another
-	 */
-	protected void checkSeams() {
-		if (partitions == null)
-			return;
-		int offset = 0;
-		for (int i = 0; i < partitions.length; i++) {
-			assertEquals("partitions are not contiguous!", partitions[i].getOffset(), offset);
-			offset = partitions[i].getOffset() + partitions[i].getLength();
-		}
-	}
-
-	/**
-	 * Compute the partitions for the given filename using the default partitioner
-	 * for that file type.
-	 * 
-	 * @param filename
-	 * @return int
-	 * @throws IOException
-	 * @throws BadLocationException
-	 */
-	protected int doComputePartitioningTest(String filename) throws IOException, BadLocationException {
-
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		InputStream inStream = getClass().getResourceAsStream(filename);
-		if (inStream == null)
-			inStream = new StringBufferInputStream("");
-		IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-		if (DEBUG_PRINT_RESULT && useFormatter) {
-			double baseTen = Math.log(10);
-			formatter.setMinimumIntegerDigits((int) (Math.log(structuredDocument.getLength()) / baseTen) + 1);
-			formatter.setGroupingUsed(false);
-		}
-
-		partitions = structuredDocument.computePartitioning(0, structuredDocument.getLength());
-		if (DEBUG_PRINT_RESULT) {
-			String contents = null;
-
-			System.out.println("\nfilename: " + filename);
-			for (int i = 0; i < partitions.length; i++) {
-				try {
-					contents = structuredDocument.get(partitions[i].getOffset(), partitions[i].getLength());
-				}
-				catch (BadLocationException e) {
-					contents = "*error*";
-				}
-				if (useFormatter)
-					System.out.println(formatter.format(partitions[i].getOffset()) + ":" + formatter.format(partitions[i].getLength()) + " - " + partitions[i].getType() + " [" + StringUtils.escape(contents) + "]");
-				else
-					System.out.println(partitions[i] + " [" + StringUtils.escape(contents) + "]");
-			}
-		}
-		checkSeams();
-		model.releaseFromEdit();
-		inStream.close();
-
-		if (partitions == null)
-			return -1;
-		return partitions.length;
-	}
-
-	/**
-	 * Retrieves the single partition at the given offset for the given file, using the
-	 * default partitioner for that file type.  This test allows for verifying the zero-length
-	 * partitioning behavior.
-	 * 
-	 * @param filename
-	 * @param offset
-	 * @return ITypedRegion
-	 * @throws IOException
-	 * @throws BadLocationException
-	 */
-	protected ITypedRegion getPartitionTest(String filename, int offset) throws IOException, BadLocationException {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		InputStream inStream = getClass().getResourceAsStream(filename);
-		IStructuredModel model = modelManager.getModelForEdit(filename, inStream, null);
-
-		IStructuredDocument structuredDocument = model.getStructuredDocument();
-
-		partitions = null;
-		ITypedRegion partition = structuredDocument.getPartition(offset);
-		if (DEBUG_PRINT_RESULT) {
-			String contents = null;
-
-			System.out.println("\nfilename: " + filename);
-			try {
-				contents = structuredDocument.get(partition.getOffset(), partition.getLength());
-			}
-			catch (BadLocationException e) {
-				contents = "*error*";
-			}
-			System.out.println(partition + " [" + StringUtils.escape(contents) + "]");
-		}
-		model.releaseFromEdit();
-		inStream.close();
-
-		return partition;
-	}
-
-	/**
-	 * Verifies that the given partitions are of the given partition types
-	 * @param typedRegions
-	 * @param types
-	 */
-	protected void verifyPartitionTypes(ITypedRegion actualTypedRegions[], String expectedTypes[]) {
-		for (int i = 0; i < expectedTypes.length; i++)
-			assertEquals("partition type mismatched", expectedTypes[i], actualTypedRegions[i].getType());
-	}
-
-	/**
-	 * Verifies that the given partitions begin at the given offsets
-	 * @param typedRegions
-	 * @param types
-	 */
-	protected void verifyPartitionRegions(ITypedRegion typedRegions[], int offsets[]) {
-		for (int i = 0; i < offsets.length; i++) {
-			assertEquals("offset mismatched", typedRegions[i].getOffset(), offsets[i]);
-			if (i > 0) {
-				assertEquals("lengths misaligned", typedRegions[i].getOffset(), typedRegions[i - 1].getOffset() + typedRegions[i - 1].getLength());
-			}
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example01.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example01.html
deleted file mode 100644
index 4a0ffe208..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example01.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE html SYSTEM nonsense>
-<html>
-<bo<!--comments-->dy>
-abcdefghijklmnopqrstuvwxyz
-</body></html>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example02.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example02.html
deleted file mode 100644
index a0286c4e6..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example02.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html><head>
-<META creator=wssa/4.0pre119>
-<title>Script Tests</title>
-</head>
-<body>
-<Script language="javascript">
-	protected void foo() {
-		String value = "true";
-		return value;
-	}
-</script>
-<Script type="text/jscript">
-	protected void foo() {
-		String value = "true";
-		return value;
-	}
-</script>
-
-<SCRIPT> "foo" </SCRIPT>
-<a href="http://example.com/" name="ref" >Example</a>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example03.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example03.html
deleted file mode 100644
index dc8daf360..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example03.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><head>
-<META creator=wssa/4.0pre119>
-<title>Script Tests</title>
-</head>
-<body>
-<Script language="javascript"></SCRIPT>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example04.html b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example04.html
deleted file mode 100644
index f8078ef65..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/text/testfiles/html/example04.html
+++ /dev/null
@@ -1,2283 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML>
-<HEAD>
-<META http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<META name="GENERATOR" content="IBM Software Development Platform">
-<TITLE>empty.htm</TITLE>
-<STYLE type="text/css">
-<!--
-.class0 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class1 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class2 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class3 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class3 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class4 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class5 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class6 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class7 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class8 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class9 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class10 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class11 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class12 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class13 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class13 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class14 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class15 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class16 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class17 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class18 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class19 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class20 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class21 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class22 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class23 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class23 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class24 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class25 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class26 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class27 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class28 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class29 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class30 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class31 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class32 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class33 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class33 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class34 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class35 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class36 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class37 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class38 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class39 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class40 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class41 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class42 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class43 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class43 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class44 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class45 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class46 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class47 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class48 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class49 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class50 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class51 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class52 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class53 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class53 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class54 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class55 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class56 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class57 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class58 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class59 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class60 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class61 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class62 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class63 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class63 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class64 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class65 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class66 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class67 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class68 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class69 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class70 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class71 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class72 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class73 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class73 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class74 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class75 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class76 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class77 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class78 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class79 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class80 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class81 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class82 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class83 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class83 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class84 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class85 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class86 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class87 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class88 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class89 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class90 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class91 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class92 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class93 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class93 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class94 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class95 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class96 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class97 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class98 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class99 {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class0 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class1 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class2 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class3 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class3 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class4 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class5 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class6 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class7 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class8 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class9 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class10 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class11 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class12 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class13 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class13 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class14 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class15 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class16 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class17 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class18 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class19 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class20 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class21 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class22 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class23 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class23 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class24 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class25 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class26 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class27 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class28 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class29 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class30 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class31 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class32 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class33 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class33 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class34 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class35 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class36 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class37 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class38 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class39 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class40 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class41 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class42 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class43 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class43 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class44 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class45 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class46 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class47 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class48 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class49 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class50 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class51 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class52 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class53 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class53 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class54 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class55 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class56 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class57 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class58 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class59 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class60 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class61 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class62 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class63 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class63 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class64 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class65 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class66 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class67 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class68 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class69 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class70 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class71 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class72 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class73 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class73 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class74 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class75 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class76 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class77 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class78 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class79 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class80 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class81 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class82 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class83 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class83 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class84 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class85 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class86 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class87 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class88 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class89 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class90 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class91 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class92 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class93 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class93 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class94 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class95 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class96 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class97 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class98 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
-.class99 TD {
-	background-color: red;
-	border-color: lime;
-	margin: 10px;
-	border-width: 1px;
-	border-style: solid
-}
--->
-</STYLE>
-</HEAD>
-<BODY>
-<TABLE border="0" cellpadding="0" cellspacing="0">
-	<TBODY>
-		<TR>
-			<TD colspan="2"><TABLE border="1">
-				<TBODY>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD></TR>
-		<TR>
-			<TD rowspan="4">
-			<TABLE border="1">
-				<TBODY>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-					<TR>
-						<TD></TD>
-						<TD></TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD>
-			<TD>
-			<TABLE border="1">
-				<TBODY>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-		<TR><TD>
-			<TABLE border="1">
-				<TBODY>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-		<TR><TD>
-			<TABLE border="1">
-				<TBODY>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-		<TR><TD>
-			<TABLE border="1">
-				<TBODY>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-					<TR>
-						<TD>a</TD>
-						<TD>b</TD>
-						<TD>c</TD>
-						<TD>d</TD>
-						<TD>e</TD>
-						<TD>f</TD>
-						<TD>g</TD>
-						<TD>h</TD>
-						<TD>i</TD>
-						<TD>j</TD>
-					</TR>
-				</TBODY>
-			</TABLE>
-			</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/CommonXML.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/CommonXML.java
deleted file mode 100644
index 94e16a24e..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/CommonXML.java
+++ /dev/null
@@ -1,86 +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.html.core.tests.utils;
-
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.wst.html.core.tests.Logger;
-import org.w3c.dom.Document;
-
-/**
- */
-public class CommonXML {
-
-	public synchronized static DocumentBuilder getDocumentBuilder() {
-		DocumentBuilder result = null;
-		try {
-			result = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-		}
-		catch (ParserConfigurationException e) {
-			Logger.logException(e);
-		}
-		return result;
-	}
-
-	public synchronized static DocumentBuilder getDocumentBuilder(boolean validating) {
-		DocumentBuilder result = null;
-		try {
-			DocumentBuilderFactory instance = DocumentBuilderFactory.newInstance();
-			instance.setValidating(validating);
-			result = instance.newDocumentBuilder();
-		}
-		catch (ParserConfigurationException e) {
-			Logger.logException(e);
-		}
-		return result;
-	}
-
-	public static void serialize(Document document, OutputStream ostream) throws IOException {
-		Source domSource = new DOMSource(document);
-		try {
-			Transformer serializer = TransformerFactory.newInstance().newTransformer();
-			try {
-				serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-				serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
-				serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-16");
-			}
-			catch (IllegalArgumentException e) {
-				// unsupported properties
-			}
-			serializer.transform(domSource, new StreamResult(ostream));
-		}
-		catch (TransformerConfigurationException e) {
-			throw new IOException(e.getMessage());
-		}
-		catch (TransformerFactoryConfigurationError e) {
-			throw new IOException(e.getMessage());
-		}
-		catch (TransformerException e) {
-			throw new IOException(e.getMessage());
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/DateUtil.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/DateUtil.java
deleted file mode 100644
index e4d1834fd..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/DateUtil.java
+++ /dev/null
@@ -1,46 +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.html.core.tests.utils;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @author davidw
- *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
- */
-public class DateUtil {
-
-	/**
-	 * Constructor for AllTests.
-	 * @param name
-	 */
-	private static String now = null;
-
-
-	public static String now() {
-		// just calculate once, so whole run as same timestamp
-		if (DateUtil.now == null) {
-			DateFormat format = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
-			Calendar calendar = Calendar.getInstance();
-			Date today = calendar.getTime();
-			DateUtil.now = format.format(today);
-		}
-		return DateUtil.now;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java
deleted file mode 100644
index 587143875..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/FileUtil.java
+++ /dev/null
@@ -1,193 +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.html.core.tests.utils;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.encoding.util.NullInputStream;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.osgi.framework.Bundle;
-
-/**
- * @author davidw
- *
- */
-public class FileUtil {
-	private static final String PLUGIN_ID = "org.eclipse.wst.html.core.tests";
-	public static final String commonEOL = "\r\n";
-	public static String fLineSeparator = System.getProperty("line.separator");
-	public static String fPathSeparator = System.getProperty("path.separator");
-	public static String fFileSeparator = System.getProperty("file.separator");
-
-	static File previousResultsDirectory = null;
-	static private String logSubDirectoryPath;
-
-	private static boolean notTriedYet = true;
-	static int uniqueNum = 0;
-
-	public static class DirFilenameFilter implements FilenameFilter {
-		String startOfAcceptableNames;
-
-		public DirFilenameFilter(String startOfDirName) {
-			startOfAcceptableNames = startOfDirName;
-		}
-
-		/**
-		 * @see java.io.FileFilter#accept(File)
-		 */
-		public boolean accept(File pathname, String filename) {
-			// we'll just assume if it starts with right key, it is a directory ... for now
-			return filename.startsWith(startOfAcceptableNames);
-		}
-
-	}
-
-	public static File getPreviousResultsDirectory(String directoryRootName) throws IOException {
-		if (previousResultsDirectory == null && notTriedYet) {
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			URL url = bundle.getEntry("/"); //$NON-NLS-1$
-			//String installPath = url.getPath();
-			// add known file so URL method below can be used
-			// (doesn't seem to work for directory?)
-			URL totalURL = new URL(url, "plugin.xml");
-			URL finalurl = FileLocator.toFileURL(totalURL);
-			String finalFile = finalurl.getFile();
-			File file = new File(finalFile);
-			String finalPath = file.getParent();
-			File pluginHomeDir = new File(finalPath);
-			FilenameFilter dirFilter = new DirFilenameFilter(directoryRootName);
-			File[] allDirs = pluginHomeDir.listFiles(dirFilter);
-
-			// assume first in list is newest, then start looking with the 
-			// second item ... just to avoid "null" case checking
-			if (allDirs.length > 0) {
-				File currentNewest = allDirs[0];
-				for (int i = 1; i < allDirs.length; i++) {
-					File current = allDirs[i];
-					// NOTE: we go by modified date, not by the actual time stamp in name.
-					// This should work for all normal cases, but may not if someone does some
-					// "funny" copying, or updating from repository.
-					if (current.lastModified() > currentNewest.lastModified()) {
-						currentNewest = current;
-					}
-				}
-				previousResultsDirectory = currentNewest;
-			}
-			notTriedYet = false;
-		}
-		return previousResultsDirectory;
-	}
-
-	public static File makeFileFor(String directory, String filename, String testResultsDirectoryPrefix) throws IOException {
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		URL url = bundle.getEntry("/");  //$NON-NLS-1$
-		URL localURL = FileLocator.toFileURL(url);
-		String installPath = localURL.getPath();
-		String totalDirectory = installPath + directory;
-		String totalPath = totalDirectory + "/" + filename;
-		URL totalURL = new URL(url, totalPath);
-		//URL finalurl = Platform.asLocalURL(totalURL);
-		String finalFile = totalURL.getFile();
-		File file = new File(finalFile);
-		String finalPath = file.getParent();
-		File dir = new File(finalPath);
-		if (!dir.exists()) {
-			// a little safety net, be sure the previous newest directory
-			// is initialized, just in case no one else has done so
-			if (testResultsDirectoryPrefix != null && testResultsDirectoryPrefix.length() > 0) {
-				FileUtil.getPreviousResultsDirectory(testResultsDirectoryPrefix);
-			}
-			// now its "safe" to make the new one
-			dir.mkdirs();
-		}
-		return file;
-	}
-
-	/**
-	 * Just a general utility method
-	 * @param filename
-	 * @return String
-	 */
-	public static String getExtension(String filename) {
-		String extension = null;
-		int dotPostion = filename.lastIndexOf('.');
-		if (dotPostion > -1) {
-			extension = filename.substring(dotPostion + 1);
-		}
-		else {
-			extension = new String();
-		}
-		return extension;
-	}
-
-	/**
-	 * General purpose utility method to ensure the log
-	 * directory exists, and returns the name. 
-	 */
-	public static String getLogDirectory() {
-		if (logSubDirectoryPath == null) {
-			String mainDirectory = "/logs";
-			File dir = new File(mainDirectory);
-			ensureExists(dir);
-			String subDirectory = TimestampUtil.timestamp();
-			logSubDirectoryPath = mainDirectory + "/" + subDirectory;
-			File subdir = new File(logSubDirectoryPath);
-			ensureExists(subdir);
-		}
-		return logSubDirectoryPath;
-	}
-
-	public static void ensureExists(File dir) {
-		if (!dir.exists()) {
-			dir.mkdirs();
-		}
-	}
-
-	public static String getPerformanceOutputLogName() {
-		String result = null;
-		String directoryName = FileUtil.getLogDirectory();
-		String extension = ".out";
-		String baseName = "sedTests";
-		long now = System.currentTimeMillis();
-		String nowStr = String.valueOf(now);
-		result = directoryName + FileUtil.fFileSeparator + baseName + nowStr + extension;
-		return result;
-	}
-	public static IDOMModel createHTMLModel() {
-		IStructuredModel model = null;
-		try {
-
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-
-			model = modelManager.getModelForEdit("test" + uniqueNum++ + ".html", new NullInputStream(), null); //$NON-NLS-1$
-
-			// always use the same line delimiter for these tests, regardless
-			// of plaform or preference settings
-			model.getStructuredDocument().setLineDelimiter(commonEOL);
-
-
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		return  (IDOMModel) model;
-
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/StringCompareUtil.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/StringCompareUtil.java
deleted file mode 100644
index a33ba6a6c..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/StringCompareUtil.java
+++ /dev/null
@@ -1,71 +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.html.core.tests.utils;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-public class StringCompareUtil {
-
-	public boolean equalsIgnoreLineSeperator(String string1, String string2) {
-
-		if (string1 == null)
-			return false;
-		if (string2 == null)
-			return false;
-
-		StringReader s1Reader = new StringReader(string1);
-		StringReader s2Reader = new StringReader(string2);
-
-		// assume true unless find evidence to the contrary
-		boolean result = true;
-		int s1Char = -1;
-		int s2Char = -1;
-		do {
-
-			s1Char = getNextChar(s1Reader);
-
-			s2Char = getNextChar(s2Reader);
-
-			if (s1Char != s2Char) {
-				result = false;
-				break;
-			}
-		}
-		while (s1Char != -1 && s2Char != -1);
-
-		return result;
-	}
-
-	/**
-	 * Method getNextChar.
-	 * @param s1Reader
-	 * @return char
-	 */
-	private int getNextChar(StringReader reader) {
-		int nextChar = -1;
-		try {
-			nextChar = reader.read();
-			while (isEOL(nextChar)) {
-				nextChar = reader.read();
-			}
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-		return nextChar;
-	}
-
-	private boolean isEOL(int aChar) {
-		return (aChar == '\n' || aChar == '\r');
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestRuntimeException.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestRuntimeException.java
deleted file mode 100644
index ad7d6cee7..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestRuntimeException.java
+++ /dev/null
@@ -1,81 +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.html.core.tests.utils;
-
-
-
-/**
- * The SourceEditingRuntimeException is often thrown by Source Editor methods when
- * a service we use throws a checked exception, but we want to convert and treat
- * as a runtime exception. (Such as BadLocationException is a common example).
- */
-public class TestRuntimeException extends RuntimeException {
-	/**
-	 * Default <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 1L;
-	private Throwable originalException;
-
-	public TestRuntimeException() {
-		super();
-	}
-
-	public TestRuntimeException(String s) {
-		super(s);
-	}
-
-	/**
-	 * This form of the constructor is used to wrapper another exception.
-	 */
-	public TestRuntimeException(Throwable t) {
-		super();
-		originalException = t;
-	}
-
-	/**
-	 * This form of the constructor is used to wrapper another exception, but still
-	 * provide a new descriptive message.
-	 */
-	public TestRuntimeException(Throwable t, String s) {
-		super(s);
-		originalException = t;
-	}
-
-	public String getMessage() {
-		String result = super.getMessage();
-		if ((result != null) && (!result.endsWith("."))) //$NON-NLS-1$
-			result = result + "."; //$NON-NLS-1$
-		if (originalException != null) {
-			String embeddedMessage = originalException.getMessage();
-			// not all exceptions (e.g. many NullPointer exception) have messages
-			String originalError = "Original error:";	//$NON-NLS-1$
-			if (embeddedMessage != null)
-				result = result + "  " + originalError + " " + embeddedMessage;//$NON-NLS-2$//$NON-NLS-1$
-			else
-				result = result + "  " + originalError + " " + originalException.toString();//$NON-NLS-2$//$NON-NLS-1$
-		}
-		return result;
-	}
-
-	public Throwable getOriginalException() {
-		return originalException;
-	}
-
-	public String toString() {
-		// we don't put super.toString or getClass to "hide" that it was a
-		// SourceEditing exception (otherwise, focus goes on that,
-		// instead of original exception.
-		String message = getMessage();
-		// message should never be null ... but just in case
-		return (message != null) ? message : super.toString();
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestWriter.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestWriter.java
deleted file mode 100644
index 593f562ca..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TestWriter.java
+++ /dev/null
@@ -1,26 +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.html.core.tests.utils;
-
-import java.io.StringWriter;
-
-public class TestWriter extends StringWriter {
-	// we don't really want to use the system EOL, since
-	// we want a common once across platforms, CVS, etc.
-	public final static String commonEOL = "\r\n";
-
-	//System.getProperty("line.separator"); 
-
-	public void writeln(String line) {
-		write(line);
-		write(commonEOL);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TimestampUtil.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TimestampUtil.java
deleted file mode 100644
index e398bb0e7..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/TimestampUtil.java
+++ /dev/null
@@ -1,51 +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.html.core.tests.utils;
-
-import com.ibm.icu.text.DateFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @author davidw
- *
- * This class provides one timestamp per VM run.
- * (Technically, per class loading.)
- */
-public class TimestampUtil {
-
-	private static Date timestamp = null;
-	private static DateFormat shortFormat = new SimpleDateFormat("yyyy'-'MM'-'dd");
-	//	private static DateFormat longFormat = new SimpleDateFormat("yyyy'-'MM'-'dd'-'kk'-'mm'-'ss");
-
-	private static String nowShort = null;
-
-	public static String timestamp() {
-
-		if (TimestampUtil.nowShort == null) {
-			TimestampUtil.nowShort = shortFormat.format(ensureTimestamp());
-		}
-		return TimestampUtil.nowShort;
-	}
-
-	protected static Date ensureTimestamp() {
-		// just calculate 'timestamp' once per class loading, 
-		// so this 'timestamp' remains the same during 
-		// entire run. 
-		if (TimestampUtil.timestamp == null) {
-			Calendar calendar = Calendar.getInstance();
-			TimestampUtil.timestamp = calendar.getTime();
-		}
-		return TimestampUtil.timestamp;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/WorkspaceProgressMonitor.java b/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/WorkspaceProgressMonitor.java
deleted file mode 100644
index 9370ace02..000000000
--- a/tests/org.eclipse.wst.html.core.tests/src/org/eclipse/wst/html/core/tests/utils/WorkspaceProgressMonitor.java
+++ /dev/null
@@ -1,54 +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.html.core.tests.utils;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-class WorkspaceProgressMonitor implements IProgressMonitor {
-	private boolean finished = false;
-
-	public void beginTask(String name, int totalWork) {
-		// we dont' care
-	}
-
-	public void done() {
-		finished = true;
-	}
-
-	public boolean isFinished() {
-		return finished;
-	}
-
-	public void internalWorked(double work) {
-		// we dont' care
-	}
-
-	public boolean isCanceled() {
-		return finished;
-	}
-
-	public void setCanceled(boolean value) {
-		if (value == true)
-			finished = true;
-	}
-
-	public void setTaskName(String name) {
-		// we don't care
-	}
-
-	public void subTask(String name) {
-		// we don't care
-	}
-
-	public void worked(int work) {
-		// we don't care
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.core.tests/test.xml b/tests/org.eclipse.wst.html.core.tests/test.xml
deleted file mode 100644
index 469292685..000000000
--- a/tests/org.eclipse.wst.html.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-
-	<property
-		name="plugin-name"
-		value="org.eclipse.wst.html.core.tests" />
-    <property
-        name="classname"
-        value="org.eclipse.wst.html.core.tests.HTMLCoreTestSuite" />
-    <property
-        name="testType"
-        value="core-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.classpath b/tests/org.eclipse.wst.html.tests.encoding/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.cvsignore b/tests/org.eclipse.wst.html.tests.encoding/.cvsignore
deleted file mode 100644
index 2048e2a1c..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-htmlencodingtests.jar
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.project b/tests/org.eclipse.wst.html.tests.encoding/.project
deleted file mode 100644
index 6068b5bad..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.html.tests.encoding</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.html.tests.encoding/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF
deleted file mode 100644
index b2d752261..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.html.tests.encoding
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: htmlencodingtests.jar
-Bundle-Activator: org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.html.tests.encoding,
- org.eclipse.wst.html.tests.encoding.html
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.xml.tests.encoding,
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.junit,
- org.eclipse.wst.sse.core
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.wst.html.tests.encoding/about.html b/tests/org.eclipse.wst.html.tests.encoding/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.html.tests.encoding/build.properties b/tests/org.eclipse.wst.html.tests.encoding/build.properties
deleted file mode 100644
index a3b623d9b..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.htmlencodingtests.jar = src/
-output.htmlencodingtests.jar = bin/
-bin.includes = htmlencodingtests.jar,\
-               testfiles/,\
-               test.xml,\
-               META-INF/,\
-               about.html
-
diff --git a/tests/org.eclipse.wst.html.tests.encoding/plugin.properties b/tests/org.eclipse.wst.html.tests.encoding/plugin.properties
deleted file mode 100644
index 36c1fc1a4..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.html.tests.encoding
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = HTML Encoding Tests Plug-in
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java
deleted file mode 100644
index b9b3f441f..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestSuite.java
+++ /dev/null
@@ -1,56 +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.html.tests.encoding;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.html.tests.encoding.html.HTMLEncodingTests;
-import org.eclipse.wst.html.tests.encoding.html.HTMLHeadTokenizerTester;
-import org.eclipse.wst.html.tests.encoding.html.TestContentTypeDetectionForHTML;
-
-public class HTMLEncodingTestSuite extends TestSuite {
-
-	private static Class[] classes = new Class[]{HTMLEncodingTests.class, HTMLHeadTokenizerTester.class, TestContentTypeDetectionForHTML.class};
-
-	public static Test suite() {
-		return new HTMLEncodingTestSuite();
-	}
-
-	public HTMLEncodingTestSuite() {
-		super("HTML Encoding Test Suite");
-		for (int i = 0; i < classes.length; i++) {
-			addTest(new TestSuite(classes[i], classes[i].getName()));
-		}
-	}
-
-	/**
-	 * @param theClass
-	 */
-	public HTMLEncodingTestSuite(Class theClass) {
-		super(theClass);
-	}
-
-	/**
-	 * @param theClass
-	 * @param name
-	 */
-	public HTMLEncodingTestSuite(Class theClass, String name) {
-		super(theClass, name);
-	}
-
-	/**
-	 * @param name
-	 */
-	public HTMLEncodingTestSuite(String name) {
-		super(name);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java
deleted file mode 100644
index fbf9ef817..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/HTMLEncodingTestsPlugin.java
+++ /dev/null
@@ -1,141 +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.html.tests.encoding;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-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 HTMLEncodingTestsPlugin extends Plugin {
-	// The shared instance.
-	private static HTMLEncodingTestsPlugin plugin;
-
-	public static List getAllTestFiles(String topDirName) {
-		List result = null;
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + topDirName;
-		File topDir = new File(location);
-		if (!topDir.isDirectory()) {
-			throw new IllegalArgumentException(topDirName + " is not a directory");
-		}
-		result = getFilesInDir(topDir);
-		return result;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static HTMLEncodingTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	private static List getFilesInDir(File topDir) {
-		List files = new ArrayList();
-		File[] topFiles = topDir.listFiles();
-		for (int i = 0; i < topFiles.length; i++) {
-			File file = topFiles[i];
-			if (file.isFile()) {
-				files.add(file);
-			}
-			else if (file.isDirectory() && !file.getName().endsWith("CVS")) {
-				List innerFiles = getFilesInDir(file);
-				files.addAll(innerFiles);
-			}
-		}
-		return files;
-	}
-
-	public static URL getInstallLocation() {
-		URL installLocation = Platform.getBundle("org.eclipse.wst.html.tests.encoding").getEntry("/");
-		URL resolvedLocation = null;
-		try {
-			resolvedLocation = FileLocator.resolve(installLocation);
-		}
-		catch (IOException e) {
-			// impossible
-			throw new Error(e);
-		}
-		return resolvedLocation;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = HTMLEncodingTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null ? bundle.getString(key) : key);
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	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;
-	}
-
-	public static Reader getTestReader(String filepath) throws FileNotFoundException {
-		URL installURL = getInstallLocation();
-		// String scheme = installURL.getProtocol();
-		String path = installURL.getPath();
-		String location = path + filepath;
-		Reader result = new FileReader(location);
-		return result;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public HTMLEncodingTestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return null;
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java
deleted file mode 100644
index 49ed8cc48..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLEncodingTests.java
+++ /dev/null
@@ -1,167 +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.html.tests.encoding.html;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CodingErrorAction;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.contenttype.HTMLResourceEncodingDetector;
-import org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-import org.eclipse.wst.sse.core.internal.encoding.IResourceCharsetDetector;
-
-public class HTMLEncodingTests extends TestCase {
-
-	/**
-	 * Ensures that an InputStream has mark/reset support.
-	 */
-	private static InputStream getMarkSupportedStream(InputStream original) {
-		if (original == null)
-			return null;
-		if (original.markSupported())
-			return original;
-		return new BufferedInputStream(original);
-	}
-
-	private boolean DEBUG = false;
-	private final String fileDir = "html/";
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = fileHome + fileDir;
-	private int READ_BUFFER_SIZE = 8000;
-
-	public HTMLEncodingTests(String name) {
-		super(name);
-	}
-
-	private void doTestFileStream(String filename, String expectedIANAEncoding, IResourceCharsetDetector detector) throws IOException {
-		File file = HTMLEncodingTestsPlugin.getTestFile(filename);
-		if (!file.exists())
-			throw new IllegalArgumentException(filename + " was not found");
-		InputStream inputStream = new FileInputStream(file);
-		// InputStream inStream = getClass().getResourceAsStream(filename);
-		InputStream istream = getMarkSupportedStream(inputStream);
-		try {
-			detector.set(istream);
-			EncodingMemento encodingMemento = ((HTMLResourceEncodingDetector)detector).getEncodingMemento();
-			String foundIANAEncoding = null;
-			if (encodingMemento != null) {
-				foundIANAEncoding = encodingMemento.getJavaCharsetName();
-			}
-			// I changed many "equals" to "equalsIgnoreCase" on 11/4/2002,
-			// since
-			// some issues with SHIFT_JIS vs. Shift_JIS were causing failures.
-			// We do want to be tolerant on input, and accept either, but I
-			// think
-			// that SupportedJavaEncodings needs to be changed to "recommend"
-			// Shift_JIS.
-			boolean expectedIANAResult = false;
-			if (expectedIANAEncoding == null) {
-				expectedIANAResult = (expectedIANAEncoding == foundIANAEncoding);
-			}
-			else {
-				expectedIANAResult = expectedIANAEncoding.equalsIgnoreCase(foundIANAEncoding);
-			}
-
-			assertTrue("encoding test file " + filename + " expected: " + expectedIANAEncoding + " found: " + foundIANAEncoding, expectedIANAResult);
-			// a very simple read test ... will cause JUnit error (not fail)
-			// if
-			// throws exception.
-			if (expectedIANAEncoding != null) {
-				ensureCanRead(filename, foundIANAEncoding, istream);
-			}
-
-		}
-		finally {
-			if (istream != null) {
-				istream.close();
-			}
-			if (inputStream != null) {
-				inputStream.close();
-			}
-		}
-	}
-
-	/**
-	 * This method just reads to stream, to be sure it can be read per
-	 * encoding, without exception.
-	 */
-	private void ensureCanRead(String filename, String encoding, InputStream inStream) throws IOException {
-		Charset charset = Charset.forName(encoding);
-		CharsetDecoder charsetDecoder = charset.newDecoder();
-		charsetDecoder.onMalformedInput(CodingErrorAction.REPORT);
-		charsetDecoder.onUnmappableCharacter(CodingErrorAction.REPORT);
-
-		InputStreamReader reader = new InputStreamReader(inStream, charsetDecoder);
-		StringBuffer stringBuffer = readInputStream(reader);
-		if (DEBUG) {
-			System.out.println();
-			System.out.println(filename);
-			System.out.println(stringBuffer.toString());
-		}
-	}
-
-	private StringBuffer readInputStream(Reader reader) throws IOException {
-
-		StringBuffer buffer = new StringBuffer();
-		int numRead = 0;
-		char tBuff[] = new char[READ_BUFFER_SIZE];
-		while ((numRead = reader.read(tBuff, 0, tBuff.length)) != -1) {
-			buffer.append(tBuff, 0, numRead);
-		}
-		return buffer;
-	}
-
-	public void testEmptyFile() throws IOException {
-		String filename = fileLocation + "EmptyFile.html";
-		// HTML has no spec default encoding. Will use platform default encoding.
-		doTestFileStream(filename, System.getProperty("file.encoding"), new HTMLResourceEncodingDetector());
-	}
-
-	public void testIllformedNormalNonDefault() throws IOException {
-		String filename = fileLocation + "IllformedNormalNonDefault.html";
-		String ianaInFile = "UTF-8";
-		doTestFileStream(filename, ianaInFile, new HTMLResourceEncodingDetector());
-	}
-
-	public void testMultiNonDefault() throws IOException {
-		String filename = fileLocation + "MultiNonDefault.html";
-		doTestFileStream(filename, "ISO-8859-6", new HTMLResourceEncodingDetector());
-	}
-
-	public void testNoEncoding() throws IOException {
-		String filename = fileLocation + "NoEncoding.html";
-		// HTML has no spec default encoding. Will use platform default encoding.
-		doTestFileStream(filename, System.getProperty("file.encoding"), new HTMLResourceEncodingDetector());
-	}
-
-	public void testnoquotes() throws IOException {
-		String filename = fileLocation + "noquotes.html";
-		doTestFileStream(filename, "UTF-8", new HTMLResourceEncodingDetector());
-
-	}
-
-	public void testNormalNonDefault() throws IOException {
-		String filename = fileLocation + "NormalNonDefault.html";
-		String ianaInFile = "UTF-8";
-		doTestFileStream(filename, ianaInFile, new HTMLResourceEncodingDetector());
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java
deleted file mode 100644
index 60ec4b260..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/HTMLHeadTokenizerTester.java
+++ /dev/null
@@ -1,260 +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.html.tests.encoding.html;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizer;
-import org.eclipse.wst.html.core.internal.contenttype.HTMLHeadTokenizerConstants;
-import org.eclipse.wst.html.core.internal.contenttype.HeadParserToken;
-import org.eclipse.wst.html.tests.encoding.HTMLEncodingTestsPlugin;
-import org.eclipse.wst.xml.core.internal.contenttype.EncodingParserConstants;
-
-public class HTMLHeadTokenizerTester extends TestCase {
-	private boolean DEBUG = false;
-	private String fCharset;
-
-	private String fContentTypeValue;
-	private final String fileDir = "html/";
-	private final String fileHome = "testfiles/";
-	private final String fileLocation = this.fileHome + this.fileDir;
-	private String fPageEncodingValue = null;
-	private String fXMLDecEncodingName;
-
-	private void doTestFile(String filename, String expectedName) throws IOException {
-		doTestFile(filename, expectedName, null);
-	}
-
-	private void doTestFile(String filename, String expectedName, String finalTokenType) throws IOException {
-		HTMLHeadTokenizer tokenizer = null;
-		Reader fileReader = null;
-		try {
-			if (this.DEBUG) {
-				System.out.println();
-				System.out.println("       " + filename);
-				System.out.println();
-			}
-			fileReader = HTMLEncodingTestsPlugin.getTestReader(filename);
-			tokenizer = new HTMLHeadTokenizer(fileReader);
-		}
-		catch (IOException e) {
-			System.out.println("Error opening file \"" + filename + "\"");
-		}
-
-		HeadParserToken resultToken = null;
-		HeadParserToken token = parseHeader(tokenizer);
-		String resultValue = getAppropriateEncoding();
-		fileReader.close();
-		if (finalTokenType != null) {
-			assertTrue("did not end as expected. found:  " + token.getType(), finalTokenType.equals(token.getType()));
-		}
-		else {
-			if (expectedName == null) {
-				assertTrue("expected no encoding, but found: " + resultValue, resultToken == null);
-			}
-			else {
-				// TODO: need to work on case issues
-				assertTrue("expected " + expectedName + " but found " + resultValue, expectedName.equals(resultValue.toUpperCase()));
-			}
-		}
-
-	}
-
-	// public void testMalformedNoEncoding() {
-	// String filename = fileLocation + "MalformedNoEncoding.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testMalformedNoEncodingXSL() {
-	// String filename = fileLocation + "MalformedNoEncodingXSL.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testNoEncoding() {
-	// String filename = fileLocation + "NoEncoding.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testNormalNonDefault() {
-	// String filename = fileLocation + "NormalNonDefault.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testNormalPageCaseNonDefault() {
-	// String filename = fileLocation + "NormalPageCaseNonDefault.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testdefect223365() {
-	// String filename = fileLocation + "SelColBeanRow12ResultsForm.jsp";
-	// doTestFile(filename);
-	// }
-	/**
-	 * returns encoding according to priority: 1. XML Declaration 2. page
-	 * directive pageEncoding name 3. page directive contentType charset name
-	 */
-	private String getAppropriateEncoding() {
-		String result = null;
-		if (this.fXMLDecEncodingName != null) {
-			result = this.fXMLDecEncodingName;
-		}
-		else if (this.fPageEncodingValue != null) {
-			result = this.fPageEncodingValue;
-		}
-		else if (this.fCharset != null) {
-			result = this.fCharset;
-		}
-		return result;
-	}
-
-	private boolean isLegalString(String tokenType) {
-		boolean result = false;
-		if (tokenType == null) {
-			result = false;
-		}
-		else {
-			result = tokenType.equals(EncodingParserConstants.StringValue) || tokenType.equals(EncodingParserConstants.UnDelimitedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTerminatedStringValue) || tokenType.equals(EncodingParserConstants.InvalidTermintatedUnDelimitedStringValue);
-		}
-		return result;
-	}
-
-	private void parseContentTypeValue(String contentType) {
-		Pattern pattern = Pattern.compile(";\\s*charset\\s*=\\s*");
-		String[] parts = pattern.split(contentType);
-		if (parts.length > 0) {
-			// if only one item, it can still be charset instead of
-			// contentType
-			if (parts.length == 1) {
-				if (parts[0].length() > 6) {
-					String checkForCharset = parts[0].substring(0, 7);
-					if (checkForCharset.equalsIgnoreCase("charset")) {
-						int eqpos = parts[0].indexOf('=');
-						eqpos = eqpos + 1;
-						if (eqpos < parts[0].length()) {
-							this.fCharset = parts[0].substring(eqpos);
-							this.fCharset = this.fCharset.trim();
-						}
-					}
-				}
-			}
-			else {
-				// fContentType = parts[0];
-			}
-
-		}
-		if (parts.length > 1) {
-			this.fCharset = parts[1];
-		}
-	}
-
-	/**
-	 * Give's priority to encoding value, if found else, looks for contentType
-	 * value;
-	 */
-	private HeadParserToken parseHeader(HTMLHeadTokenizer tokenizer) throws IOException {
-		this.fPageEncodingValue = null;
-		this.fCharset = null;
-		/*
-		 * if (tokenType == XMLHeadTokenizerConstants.XMLDelEncoding) { if
-		 * (tokenizer.hasMoreTokens()) { ITextHeadRegion valueToken =
-		 * tokenizer.getNextToken(); String valueTokenType =
-		 * valueToken.getType(); if (isLegal(valueTokenType)) { resultValue =
-		 * valueToken.getText(); if (DEBUG) { System.out.println("XML Head
-		 * Tokenizer Found Encoding: " + resultValue); } } } }
-		 */
-		HeadParserToken token = null;
-		HeadParserToken finalToken = null;
-		do {
-			token = tokenizer.getNextToken();
-			if (this.DEBUG) {
-				System.out.println(token);
-			}
-			String tokenType = token.getType();
-			if (tokenType == HTMLHeadTokenizerConstants.MetaTagContentType) {
-				if (tokenizer.hasMoreTokens()) {
-					HeadParserToken valueToken = tokenizer.getNextToken();
-					if (this.DEBUG) {
-						System.out.println(valueToken);
-					}
-					String valueTokenType = valueToken.getType();
-					if (isLegalString(valueTokenType)) {
-						this.fContentTypeValue = valueToken.getText();
-
-					}
-				}
-			}
-
-		}
-		while (tokenizer.hasMoreTokens());
-		if (this.fContentTypeValue != null) {
-			parseContentTypeValue(this.fContentTypeValue);
-		}
-		finalToken = token;
-		return finalToken;
-
-	}
-
-	public void testBestCase() throws IOException {
-		String filename = this.fileLocation + "NormalNonDefault.html";
-		doTestFile(filename, "UTF-8");
-
-	}
-
-	// public void testIllFormed() {
-	// String filename = fileLocation + "testIllFormed.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testIllFormed2() {
-	// String filename = fileLocation + "testIllFormed2.jsp";
-	// doTestFile(filename);
-	// }
-	// public void testIllformedNormalNonDefault() {
-	// String filename = fileLocation + "IllformedNormalNonDefault.jsp";
-	// doTestFile(filename);
-	// }
-	public void testEmptyFile() throws IOException {
-		String filename = this.fileLocation + "EmptyFile.html";
-		doTestFile(filename, null);
-	}
-
-	public void testIllFormedNormalNonDefault() throws IOException {
-		String filename = this.fileLocation + "IllformedNormalNonDefault.html";
-		doTestFile(filename, "UTF-8");
-	}
-
-	public void testLargeCase() throws IOException {
-		String filename = this.fileLocation + "LargeNonDefault.html";
-		doTestFile(filename, "ISO-8859-1");
-
-	}
-
-	public void testLargeNoEncoding() throws IOException {
-		String filename = this.fileLocation + "LargeNoEncoding.html";
-		doTestFile(filename, null, EncodingParserConstants.MAX_CHARS_REACHED);
-
-	}
-
-	public void testMultiNonDefault() throws IOException {
-		String filename = this.fileLocation + "MultiNonDefault.html";
-		doTestFile(filename, "ISO-8859-6");
-	}
-
-	public void testNoEncoding() throws IOException {
-		String filename = this.fileLocation + "NoEncoding.html";
-		doTestFile(filename, null);
-	}
-
-	public void testnoquotes() throws IOException {
-		String filename = this.fileLocation + "noquotes.html";
-		doTestFile(filename, "UTF-8");
-
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/TestContentTypeDetectionForHTML.java b/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/TestContentTypeDetectionForHTML.java
deleted file mode 100644
index dab37b97c..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/src/org/eclipse/wst/html/tests/encoding/html/TestContentTypeDetectionForHTML.java
+++ /dev/null
@@ -1,54 +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.html.tests.encoding.html;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.xml.tests.encoding.read.TestContentTypeDetection;
-
-public class TestContentTypeDetectionForHTML extends TestContentTypeDetection {
-	public void testFile57() throws CoreException, IOException {
-		doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/EmptyFile.html", null);
-	}
-
-	public void testFile58() throws CoreException, IOException {
-		doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/IllformedNormalNonDefault.html", null);
-	}
-
-	public void testFile59() throws CoreException, IOException {
-		doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/LargeNoEncoding.html", null);
-	}
-
-
-	public void testFile60() throws CoreException, IOException {
-		doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/LargeNonDefault.html", null);
-	}
-
-	public void testFile61() throws CoreException, IOException {
-		doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/MultiNonDefault.html", null);
-	}
-
-	public void testFile62() throws CoreException, IOException {
-		doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/NoEncoding.html", null);
-	}
-
-	public void testFile63() throws CoreException, IOException {
-		doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/noquotes.html", null);
-	}
-
-	public void testFile64() throws CoreException, IOException {
-		doTest("org.eclipse.wst.html.core.htmlsource", "testfiles/html/NormalNonDefault.html", null);
-	}
-
-}
diff --git a/tests/org.eclipse.wst.html.tests.encoding/test.xml b/tests/org.eclipse.wst.html.tests.encoding/test.xml
deleted file mode 100644
index fbbf7722f..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-
-	<property
-		name="plugin-name"
-		value="org.eclipse.wst.html.tests.encoding" />
-    <property
-        name="classname"
-        value="org.eclipse.wst.html.tests.encoding.HTMLEncodingTestSuite" />
-    <property
-        name="testType"
-        value="core-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/EmptyFile.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/EmptyFile.html
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/EmptyFile.html
+++ /dev/null
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/IllformedNormalNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/IllformedNormalNonDefault.html
deleted file mode 100644
index ef8b5c803..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/IllformedNormalNonDefault.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
-	<FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
-	<FRAMESET cols="160,*">
-		<FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
-		<FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
-	</FRAMESET>
-	<NOFRAMES>
-	<BODY>
-	<P>To view this page, you need a browser that supports frames.</P>
-	</BODY>
-	</NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html
deleted file mode 100644
index 84ca60e79..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNoEncoding.html
+++ /dev/null
@@ -1,664 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C/DTD/ HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
-<META content="text/css" http-equiv="Content-Style-Type">
-<title>smoke</title>
-</head>
-<body>
-<h2> Smoke Test - XML Editor</h2>
-Last updated: June 25, 2001
-<P>This Smoke Test primarily focuses on the RTP portion of the XML 
-Editior, which is the Source page of the XML Editor. It also performs 
-some integration testing. For example, it tests synchronization between 
-the Design and Source pages of the XML Editor, as well as with the 
-Outline and Properties views. It also verifies that files created 
-through the XML File wizard and references to the XML Catalog are 
-supported as expected.</P>
-<P><FONT color="#ff0000"><B>NOTE</B>: XML files are case-sensitive so be sure that things appear 
-exactly as noted.</FONT></P>
-
-<!-- ===========================================================
-                           Setup
-     ===========================================================
--->
-<H2><FONT color="#0000ff">Setup</FONT></H2>
-<P><B>Starting Clean</B></P>
-<ul>
-    <li> Delete any existing workbench</li>
-    <li> Start Eclipse</li>
-</ul>
-<P><B>Open an XML Perspective<BR>
-</B></P>
-<UL>
-    <LI>Select the <B>Open Perspective</B> toolbar button in the upper left</LI>
-    <LI>Select <B>Other...</B></LI>
-    <LI>Select <B>XML</B></LI>
-    <LI>Verify the following views appear in the XML perspective: <FONT color="#ff0000">The location of the Outline and Navigator views are reversed from the Resource and Web perspectives. Do we want to try to be consistent across the perspectives? Also, I opened <B>defect</B> 177664 to enable easy access to the Properties view from within the XML perspective. If this view isn't included in the Perspective because its use is limited, then recommend we at least provide a Show or Hide Properties View toolbar button (similar to the buttons that Page Designer provides).</FONT></LI>
-</UL>
-<P><B>Project Creation and File Imports<BR>
-</B></P>
-<UL>
-    <LI>Create a Project, <B>XMLTest2</B> </LI>
-    <LI>Import the following files into this project:
-    <UL>
-        <LI><B>PurchaseOrder.xsd</B></LI>
-        <LI><B>Invoice.dtd</B></LI>
-    <LI><B>JobDesc.xml</B></LI>
-    <LI><B>Wireless.xml</B></LI>
-    <LI><B>gotchaTCBeans.set</B></LI>
-    <LI><B>ATS.dtd</B></LI>
-    <LI><FONT color="#ff0000">any others?</FONT></LI>
-    </UL>
-    </LI>
-</UL>
-
-<!-- ===========================================================
-                    Create/Open/Edit test cases
-     ===========================================================
--->
-<H2><FONT color="#0000ff">Create/Open/Edit test cases</FONT></H2>
-<P><B>Create an XML File from scratch</B></P>
-<UL>
-    <LI>Select the <B>Create a new XML file</B> toolbar button.</LI>
-    <LI>Verify the Create a XML File wizard appears and the Finish button is disabled. <FONT color="#ff0000"><B>DEFECT:</B> 177660 - XML File wizard: disable Finish button on the first page</FONT>.</LI>
-    <LI>Accept the default to <B>Create a new XML file</B></LI>
-    <LI>Go to the Next page
-    <UL>
-        <LI>Select <B>XMLTest2</B> as the folder</LI>
-        <LI>Specify a File name of <B>fromScratch</B></LI>
-        <LI>Select <B>Finish</B></LI>
-    </UL>
-    </LI>
-    <LI>Verify the following:
-    <UL>
-        <LI>fromScratch.xml appears in the Navigator view.</LI>
-        <LI>fromScratch.xml is open to the Design page of the XML Editor and has focus.</LI>
-        <LI>the Design tab appears before the Source tab in the XML Editor.</LI>
-        <LI>the Design and Source page show no content.</LI>
-        <LI>the Outline and Properties views show nothing.</LI>
-    </UL>
-    </LI>
-    <LI>Switch to the Source page. Verify the cursor appears at the beginning of the file.</LI>
-    <LI>Right mouse button 2 and verify a popup menu appears.</LI>
-    <LI>Hit <B>Ctrl+Space</B>. Verify the content assist proposal list appears.</LI>
-    <LI>Select <B>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;</B></LI>
-    <LI>Verify &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt; is inserted and appears syntax highlighted and an entry appears for it in the Outline view.</LI>
-    <LI>Position the cursor within the XML declaration and verify <B>version</B> and <B>encoding</B> appear in the Properties view. <FONT color="#ff0000">This used to work, but now it's not working. Opened <B>defect</B> 177662 - XML declaration attributes not appearing in Properties view. If we decide to not treat version and encoding as attributes, then this step should be removed.</FONT></LI>
-    <LI>Continue to the next section.</LI>
-</UL>
-<P><B>Identify a local DTD (</B>verifies a DTD is immediately recognized; in the past, you had to close and reopen the Workbench<B>)</B></P>
-<UL>
-    <LI>Type the following after the XML declaration in <B>fromScratch.xml</B>: <B>&lt;!DOCTYPE Invoice SYSTEM &quot;Invoice.dtd&quot;&gt;</B>. The text should be syntax highlighted as you type and you should see an entry get added to the Outline view.</LI>
-    <LI>Hit <B>Enter</B> to create a new line after the DOCTYPE declaration.</LI>
-    <LI>Hit <B>Ctrl+Space</B>.Verify only <B>Invoice</B> and <B>comment</B> appear in the proposal list. (<B>NOTE</B>: <B>Invoice</B> is the root element)</LI>
-    <LI>Hit <B>Enter</B> to accept <B>Invoice</B> as a selection. Verify the Invoice start and end tags are inserted into the Source and the cursor appears between them. An element entry should appear for Invoice in the Outline view. (<B>NOTE</B>: XML is case-sensitive so be sure you see Invoice and not invoice everywhere).</LI>
-    <LI>Hit <B>Ctrl+Space</B>. Verify the following appears in the proposal list (in the order shown): <FONT color="#ff0000">Item is appearing before Header. The default is not to sort the list alphabetically. That means the list should be sorted based on the order in which the child tags are defined in the element definition for Invoice in the DTD. In other words, users should see child tags listed according to their sequencing order in the DTD, which the DTD Editor shows. Violating the sequencing order causes an XML file to become not valid. <B>DEFECT:</B> 177668</FONT>
-    <UL>
-        <LI>Header</LI>
-        <LI>Item</LI>
-        <LI>comment</LI>
-    </UL>
-    </LI>
-    <LI>Hit <B>Enter</B> to accept <B>Header</B> as a selection.</LI>
-    <LI>Verify the Source now looks like the following and the cursor appears before <B>invoiceNumber</B>:<IMG border="0" height="83" src="identifyDTD.jpg" width="485"></LI>
-    <LI>Verify <B>Header</B> appears nested under <B>Invoice</B> in the Outline view.</LI>
-  <LI>Close this file, and respond <B>Yes</B> when prompted to save the changes.</LI>
-  <LI>Reopen the file and verify the changes were saved.</LI>
-  <LI>Close the file. Verify no save changes prompt appears.</LI>
-</UL>
-<P><B>Create an XML File from an imported DTD</B></P>
-<UL>
-    <LI>Select the <B>File-&gt;New-&gt;XML File</B>.</LI>
-    <LI>Verify the Create a XML File wizard appears.</LI>
-    <LI>Select to <B>Create a new XML file from a DTD file</B></LI>
-    <LI>Go to the Next page
-    <UL>
-        <LI>Select <B>XMLTest2</B> as the folder</LI>
-        <LI>Specify a File name of <B>fromLocalDTD</B></LI>
-        <LI>Go to the Next page</LI>
-    </UL>
-    </LI>
-    <LI>Select the <B>Import File</B> button
-    <UL>
-        <LI>Use the Browse button to find <B>testcase.dtd</B></LI>
-        <LI>Select <B>XMLTest2</B> as the folder. <FONT color="#ff0000">Would be nice if this were already filled in. Open a defect.</FONT></LI>
-        <LI>Select <B>Finish</B> to close the Import File wizard</LI>
-    </UL>
-    </LI>
-    <LI>Expand <B>XMLtest2</B> and then select <B>testcase.dtd</B>. <FONT color="#ff0000">Was expecting to see the imported file selected in the Workbench files list, but it wasn't. Open a defect.</FONT></LI>
-    <LI>Go to the Next page.</LI>
-    <LI>Select <B>testcase</B> as the Root Element.</LI>
-    <LI>Accept the default to <B>Create required content only</B>.</LI>
-    <LI>Verify <B>testcase.dtd</B> appears as the System Id.</LI>
-    <LI>Select Finish. Verify <B>fromLocalDTD.xml</B> appears in the XML Editor. Verify the Source page looks like the following: <IMG border="0" height="290" src="importDTD.jpg" width="660"></LI>
-  <LI>Verify the Outline view and the formatting indentation reflect the proper element/tag hierarchy. Here's what the Outline view should look like:<IMG border="0" height="297" src="outline1.jpg" width="655"></LI>
-  <LI>Verify selection synchronization between the Design page, Source page, Outline view, 
-        and Properties view.
-    <UL>
-        <LI>From the Source page, click within the <B>header</B> start tag. 
-            Verify <B>header</B> is selected in the Outline view and in the Design 
-            page and that the following properties and property values appear in the 
-            Properties view:
-        <TABLE border="1">
-            <TBODY>
-                <TR>
-                    <TD width="100"><B>Property</B></TD>
-                    <TD width="76"><B>Value</B></TD>
-                </TR>
-                <TR>
-                    <TD width="100">category</TD>
-                    <TD width="76">webtool</TD>
-                </TR>
-                <TR>
-                    <TD width="100">number</TD>
-                    <TD width="76">idvalue0</TD>
-                </TR>
-                <TR>
-                    <TD width="100">state</TD>
-                    <TD width="76">&nbsp;</TD>
-                </TR>
-                <TR>
-                    <TD width="100">subCategory</TD>
-                    <TD width="76">Accessability</TD>
-                </TR>
-                <TR>
-                    <TD width="100">subSubCategory</TD>
-                    <TD width="76">&nbsp;</TD>
-                </TR>
-            </TBODY>
-        </TABLE>
-        </LI>
-	<LI>From the Outline view, select the <B>testBucket</B> tag.
-            Verify <B>testBucket</B> is selected in the Design page and the current marker
-            in the lefthand margin of the Source page indicates the range of the 
-            <B>testBucket</B> tag. The Properties view should show a property of <B>type</B>
-            with a value of <B>ComponentTest</B>.
-        </LI>
-    </UL>   
-    </LI> 
-    <LI>Verify edit synchronization between the Design page, Source page, and 
-        Properties view (focus here is on adding attributes and attribute values).
-    <UL>
-        <LI>From the Source page, use content assist to insert an attribute and attribute value
-            for the <B>header</B> start tag.
-            <UL>
-            <LI>Position the cursor after the <B>category</B> attribute in the <B>header</B> start tag.</LI>
-            <LI>Type <B>space</B> and then hit prompt for content assist.</LI>
-            <LI>Verify only <B>state</B> and <B>subSubCategory</B> appear in the proposal list (content assist is smart enough not to list any attributes that already exist in the start tag since attributes can only appear once. <FONT color="#0000ff">Cool!</FONT>).</LI>
-            <LI>Select <B>state</B>.</LI>   
-            <LI>Verify <B>state="UnderConstruction"</B> is inserted in the Source page (content assist automatically inserts any default values. <FONT color="#0000ff">Cool!</FONT>). Verify the Design page and Properties view reflect this change.</LI>         
-            </UL>
-        </LI>
-        <LI>From the Properties view, update the <B>state</B> attribute value to "UnderReview" 
-            (a pulldown list of values should be available). Verify the change is reflected
-            in the Source and Design pages.
-        </LI>
-        <LI>From the Design page, add an attribute and attribute value to the <B>header</B> tag.
-            <UL>
-            <LI>Bring up the popup menu for the <B>header</B> tag.</LI>
-            <LI>Select <B>Add Attribute->subSubCategory</B> from the popup menu (it's smart
-                enough to know which attributes haven't been specified yet ... like content 
-                assist. Cool!).</LI>
-            <LI>Type in a value of <B>Keyboard support</B>.</LI>
-            <LI>Verify the change is reflected in the Source page and Properties view</LI>
-            </UL>
-        </LI>
-    </UL>
-    </LI>
-</UL>
-<P><B>Open an XML File that references a remote DTD</B></P>
-<UL>
-    <LI>Open the <B>Wireless.xml</B> file.</LI>
-    <LI>Verify it looks like the following in the Source page:<IMG border="0" height="239" src="wireless.jpg" width="656"></LI>
-    <LI>Verify the Outline view and the formatting indentation reflect the proper 
-        element/tag hierarchy. Here's what the Outline view should look like: <IMG border="0" height="189" src="outline2.jpg" width="656"></LI> 
-    <LI>Verify content assist <FONT color="#ff0000">Defect 176379 (in verify state, but still not working)</FONT>.</LI>
-        <UL>
-           <LI>Create a new line after the <B>wml</B> start tag.</LI>
-           <LI>Prompt for content assist on the new line.</LI>
-           <LI>Verify the following appear as proposals (in the order shown): 
-               <UL>
-                   <LI>head</LI>
-                   <LI>template</LI>
-                   <LI>card</LI>
-               </UL>
-           </LI>
-           <LI>Create a new line after the <B>wml</B> start tag.</LI>
-           <LI>Type a space before the ending delimiter on the card start tag.</LI>
-           <LI>Prompt for content assist</LI>
-           <LI>Verify the following appear as proposals (not necessarily in the
-               order shown). 
-               <UL>
-                   <LI>title</LI>
-                   <LI>newcontext</LI>
-                   <LI>ordered</LI>
-                   <LI>xml:lang</LI>
-                   <LI>onenterbackward</LI>
-                   <LI>ontimer</LI>
-                   <LI>id</LI>
-                   <LI>class</LI>
-               </UL>
-           </LI>
-           <LI>Position the cursor within the <B>method</B> attribute value in the <B>go</B> start tag.</LI>
-           <LI>Prompt for content assist</LI>
-           <LI>Verify <B>post</B> and <B>get</B> appear as proposals.</LI>
-        </UL>
-    <LI>Verify selection synchronization between the Design page, Source page, Outline view, 
-        and Properties view.
-    <UL>
-        <LI>From the Source page, click within the <B>card</B> start tag. 
-            Verify <B>card</B> is selected in the Outline view and in the Design 
-            page and that the content assist proposals listed above for the
-            <B>card</B> tag appear as properties in the Properties view. No values should appear for these properties.</LI>
-	<LI>From the Outline view, select the <B>postfield</B> tag.
-            Verify <B>postfield</B> is selected in the Design page and the current marker
-            in the lefthand margin of the Source page indicates the range of the 
-            <B>postfield</B> tag. The Properties view should show the following properties,
-            none of which should have a value:
-               <UL>
-                   <LI>name</LI>
-                   <LI>value</LI>
-                   <LI>id</LI>
-                   <LI>class</LI>
-               </UL>
-           </LI>
-    </UL>   
-    </LI>
-    <LI>Verify edit synchronization between the Design page, Source page, Outline view, and 
-        Properties view (focus here is on adding elements/tags).
-    <UL>
-        <LI>From the Source page, copy and paste the <B>card</B> tag.
-            <UL>
-            <LI>Position the cursor in the <B>card</B> start tag.</LI>
-            <LI>Notice the range of the <B>card</B> tag in the lefthand margin area.</LI>
-            <LI>Copy this range of lines using the <B>Edit->Copy</B> pulldown menu selection.</LI>
-            <LI>Paste after the <B>card</B> end tag using Ctrl+V.</LI>
-            <LI>Verify the appropriate lines were pasted n the Source page.
-                Verify the Design page, Outline view, and the Properties 
-                view reflect this change.</LI>         
-            </UL>
-        </LI>
-        <LI>From the Design page, add another <B>card</B> tag.
-            <UL>
-            <LI>Bring up the popup menu for the <B>wml</B> tag.</LI>
-            <LI>Select <B>Add Child->card</B> from the popup menu.</LI>
-            <LI>Verify the Source page, Outline view, and the Properties
-                view reflect this change. NOTE: it should have generated out
-                the same thing as the original card tag, with the exception
-                that a <B>method</B> attribute should not exist in the <B>go</B> start tag. </LI>
-            </UL>
-        </LI>
-    </UL>
-    </LI> 
-</UL>
-<P><B>Create and Validate an XML File from a schema</B><BR>
-
-<P>(these steps are taken from the 'Design' smoke test, except the Source Page is the focus)</P>
-<ul>
-<li>
-Right mouse button 2 on the PurchaseOrder.xsd and select <b>Create XML
-File</b>.</li>
-
-<li>
-Accept the default file names.</li>
-
-<li>
-In the Select Root Element page, choose <b>purchaseOrder</b> as root element.</li>
-
-<li>
-Choose <b>Create required and optional content</b> to create a minimal
-document.</li>
-
-<li>
-Enter <b>po</b> as the namespace prefix.</li>
-
-<li>On Finish, a PurchaseOrder.xml is created and the XML Editor is opened. (Select Source Page if not already there.)</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml should be invalid.</li>
-
-<li>
-Double click on the error message. It should be positioned to the line
-in error, i.e. the <b>partNum</b> attribute. It is invalid because the
-value is not set to match the XML schema pattern facet "d3-[A-Z]{2}" (3
-digits followed by 2 characters).</li>
-
-<li>In the Source View, locate the <b>partNum</b> attribute under element item.
-Enter the value 333-AB.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</UL>
-<UL>
-  <LI>
-  <HR></LI>
-  <li>Place the cursor after the &lt;items&gt; tag and besure "item" is 
-  listed in the content assist list. </li>
-<li>Rename the purchaseOrder.xsd to, say, purchaseOrderHOLD.xsd</li>
-<li>Verify that content assist still gives you "item" as above.</li>
-<li>Now select the "Reload Dependancies" button.</li>
-<li>Verify that now content assist no longer lists any items other 
-that the macro "comment".</li>
-<li>Repeat making purchaseOrder.xsd workable again.</li>
-</ul>
-<P></P><P></P><P></P><P></P><P></P></P>
-<P><B>Open an XML File for a shipped DTD catalog entry</B><BR>
-<BR>
-[put in optional section .. this isn't a customer scenerio]<BR>
-To verify that shipped DTDs are working:<BR>
-<UL>
-<LI>
-Use a web project with a standard web.xml file in it. Be sure 
-there is no web-app_2_2.dtd file in the directory. In the web.xml file 
-itself, mangle the web-app_2_2.dtd filename in the system id a little, such as 
-change it to xeb-app_2_2.dtd to be sure it can't be found via the
-normal http method (This isn't really necessary for the funtion to work,
-its just to be sure only the catalog function is in effect).
-</LI>
-<LI>
-Go to the preferences page, and open the XML Catalog. Verify there 
-is an entry for -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN.
-</LI>
-<LI>
-Once all the prep work is done (files deleted, text modified), you should 
-exit and restart Eclipse to be sure you have a fresh start.
-</LI>
-<LI>
-Open the web.xml file and be sure that content assist works for that file.
-For example, right after the end of the &lt;/display-name&gt; tag, ctrl-space 
-should provide a long list of elements, starting with servlet, servlet-mapping, etc.
-This indicates the shipped DTD function is working and configured 
-correctly (at least for the web.xml file).
-</LI>
-</UL>
-</P>
-<P><B>Create an XML File from a new DTD catalog entry</B><BR><IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<b>The following comes directly from the 'Design' Smoke Test: XML Catalog for XML Schema</b>
-<ul>
-<li>
-Run Validate on PurchaseOrder.xml to make sure it is valid</li>
-
-<li>
-Create a new project, XMLTest2</li>
-
-<li>
-Move the PurchaseOrder.xsd into XMLTest2.</li>
-
-<li>
-Run Validate on PurchaseOrder.xml. You will notice that it is no longer
-valid. The error message should give you a hint that the file PurchaseOrder.xsd
-can no longer be found.</li>
-
-<li>
-Open the Window->Preferences and select the XML Catalog.</li>
-
-<li>
-Enter the pair <b>Id = PurchaseOrder.xsd Uri = f:\eclipse\XMLTest2\PurchaseOrder.xsd</b></li>
-
-<br>Or alternatively, you can use a relative path to the install directory
-of the workbench as follows:
-<br><b>Id = PurchaseOrder.xsd Uri = .\XMLTest2\PurchaseOrder.xsd</b>
-<li>
-Click on the Reload button to reload the catalog settings.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</ul>
-<!-- ===========================================================
-                      Save/Validate test cases
-     ===========================================================
--->
-<H2><FONT color="#0000ff">Save/Validate test cases</FONT></H2>
-<P><B>Saving an XML File</B><BR>
-(NOTE: the <B>Identify a local DTD</B> test case tests the save prompt on a file close.)</P>
-<UL>
-  <LI>If any files are open, select <B>File-&gt;Close All</B> (or <B>Ctrl+Shift+F4</B>) to close them.</LI>
-  <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
-  <LI>Verify the following (no-changes-made condition):
-  <UL>
-    <LI><B>File-&gt;Save</B> is disabled.</LI>
-    <LI><B>File-&gt;Save All</B> is disabled.</LI>
-    <LI><B>File-&gt;Save As</B> is enabled.</LI>
-    <LI>the <B>Save</B> toolbar button (a diskette) is disabled.</LI>
-    <LI>the <B>Save As</B> toolbar button is enabled.</LI>
-    <LI><B>Save</B> is disabled on the Source popup menu. <FONT color="#ff0000">Would be nice if the Design popup menu also had a Save selection. Open a suggestion defect.</FONT></LI>
-    <LI>no <B>*</B> appears in the file tab.</LI>
-  </UL></LI>
-  <LI>Make a change in the Source page.</LI>
-  <LI>Verify the following (changes-made condition):
-  <UL>
-    <LI><B>File-&gt;Save</B> is enabled.</LI>
-    <LI><B>File-&gt;Save All</B> is enabled</LI>
-    <LI>the <B>Save</B> toolbar button (a diskette) is enabled.</LI>
-    <LI><B>Save</B> is enabled on the Source popup menu.</LI>
-    <LI>a <B>*</B> appears in the file tab.</LI>
-  </UL></LI>
-  <LI>Hit <B>Ctrl+S</B>. </LI>
-  <LI>Verify the no-changes-made conditions apply.</LI>
-  <LI>Make a change in the Design page.</LI>
-  <LI>Verify the changes-made conditions apply.</LI>
-  <LI>File-&gt;Save All<B></B>.</LI>
-  <LI>Verify the no-changes-made conditions apply.</LI>
-  <LI>Make a change in the Properties view.</LI>
-  <LI>Verify the changes-made conditions apply.</LI>
-  <LI>Select <B>Save</B> from the Source popup menu.</LI>
-  <LI>Verify the no-changes-made conditions apply.</LI>
-  <LI>Close and then reopen the file.</LI>
-  <LI>Verify the changes that were made in the previous steps appear in the Design and Source pages.</LI>
-</UL>
-<P><B>Saving an XML File across multiple perspectives (optional)</B></P>
-<UL>
-  <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
-  <LI>Make a change to the file.</LI>
-  <LI>Open another XML Perspective by:
-  <UL>
-    <LI><B>selecting Perspective-&gt;Open-&gt;Other...</B></LI>
-    <LI>while holding down the <B>Shift</B> key, select <B>XML</B>.</LI>
-  </UL></LI>
-  <LI>Verify another XML Perspective button appears in the lefthand side of the Workbench to represent this second perspective.</LI>
-  <LI>Open the same xml file as in the first step above.</LI>
-  <LI>Verify the changes-made conditions apply in both XML Perspectives and verify that the changes made to the file in the first perspective appear in the same file in the second perspective. <FONT color="#ff0000">The * never appears in the file tab of the second perspective even when make changes to the file in the second perspective. Talk to David.</FONT></LI>
-  <LI>Make some changes to the file in the second perspective.</LI>
-  <LI>Verify these changes appear in the same file in the first perspective.</LI>
-  <LI>Close the file in the second perspective and respond <B>Yes</B> to the save changes prompt.</LI>
-  <LI>Verify the no-changes-made condition applies in the first perspective.</LI>
-</UL>
-<P><B>Validating a non well formed XML File (no DTD/Schema)</B><BR>
-(NOTE: it's important that the following be typed in. This test case tries to cover some of the more common errors that render an XML file as not being well-formed. It is not intended to verify that all possible errors are being detected and gracefully handled. )</P>
-<UL>
-  <LI>Select the <B>Create a new XML file</B> toolbar button.</LI><LI>Accept the default to <B>Create a new XML file</B></LI>
-  <LI>Go to the Next page
-    <UL>
-        <LI>Select <B>XMLTest2</B> as the folder</LI>
-        <LI>Specify a File name of <B>NonWellFormed</B></LI>
-        <LI>Select <B>Finish</B></LI>
-  </UL></LI>
-  <LI>Prompt for content assist.</LI>
-  <LI>Select <B>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;.</B></LI>
-  <LI>Create a new line after the XML declaration.</LI>
-  <LI>Prompt for content assist.</LI>
-  <LI>Select comment.</LI>
-  <LI>Embed more than 2 consecutive dashes in the comment. 
-        <FONT color="#0000ff">(NOTE: more than 2 consecutive dashes can not be embedded within a comment)</FONT></LI>
-  <LI>Type in the remaining lines as shown below: 
-        <FONT color="#ff0000">(I can't show the lines until defect 177755 is fixed ... until then, here's the type of things that cause 
-        a document to not be well-formed):</FONT>
-  <UL>
-    <LI>create a start and end tag that don't match in their case sensitivity 
-        (e.g., &lt;tag&gt; and &lt;/Tag&gt;). </LI>
-    <LI>create a start and end tag where the start tag contains an attribute value that is not 
-        enclosed in quotes.
-        <FONT color="#0000ff">(NOTE: this is permitted in HTML, but not XML)</FONT></LI>
-    <LI>create tags that are not properly nested.
-        <FONT color="#0000ff">(NOTE: a child tag must be completed before its parent tag)</FONT></LI>
-    <LI>create a start tag without a corresonding end tag.
-        <FONT color="#0000ff">(NOTE: all start tags must have a corresponding end tag unless the 
-        tag is an empty tag, in which case the shorthand version can be used (&lt;shortTag/&gt;)).</FONT></LI>
-    <LI>do not provide an attribute value (=&quot;value&quot;).
-        <FONT color="#0000ff">(NOTE: this is permitted in HTML for those attributes that have 
-        only one value, but it's not valid in XML)</FONT></LI>
-     <LI>define an attribute more than once in a start tag.</LI>
-  </UL></LI>
-  <LI>Save the file.</LI>
-  <LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate 
-         lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations 
-         and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-  <LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-
-<P><B>Validate an XML File based on a DTD</B></P>
-<UL>
-<LI>Open <B>fromScratch.xml</B>.</LI>
-<LI>Delete a character from one of the start tags (mistyping a tag is not uncommon).</LI>
-<LI>Prompt for content assist within the bad tag. Verify a message appears in the status area
-of the Workbench indicating that the bad tag is an unknown tag.</LI>
-<LI>Select the <B>Validate</B> toolbar button.</LI>
-<LI>Verify an error appears in the Tasks view and an error marker appears in the Source page
-to flag the invalid tag.</LI>
-<LI>Select <B>Edit->Undo</B> from the Source page.</LI>
-<LI>Verify the bad tag error no longer appears in the Tasks view.</LI>
-<LI>Remove the <B>Header</B> end tag from the Source page.</LI>
-<LI>Save the file.</LI>
-<LI>Verify an error appears in the Tasks view indicating that the <B>Header</B> end tag is missing</LI>
-<LI>Close the file, responding <B>Yes</B> to the save changes prompt.</LI>
-<LI>Double-click on the error in the Tasks view, and verify <B>fromScratch.xml</B> opens to the
-appropriate line in the Source page of the XML Editor.</LI>
-<LI>Here's some other violations that can be attempted:
-<UL>
-<LI>Specify a bad attribute.</LI>
-<LI>Specify a bad attribute value.</LI>
-<LI>Specify child tags out of sequencing order</LI>
-<LI>Violate the occurrence indicator for a tag (e.g., if the DTD shows ?, then only
-0 or 1 occurrences of the tag is permitted).
-</UL></LI>
-<LI>Save the file.</LI>
-<LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate 
-lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations 
-and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-<LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-<!--  removed since done elsewhere as part of other scenerios
-<P><B>Validate an XML File based on a Schema</B><BR>
--->
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<!-- ===========================================================
-                        Source Specific test cases
-     ===========================================================
--->
-<H2><B><FONT color="#0000ff">Source Specific test cases (optional)</FONT></B></H2>
-<P><B>Using the Auto Completion Content Assist Preference</B><BR>
-<UL>
-<LI>Open a any XML file that has enough tags to provide syntax hightlighting.</LI>
-<LI>While that file is left open, go to the Preferences page, select
-XML Editor, then Source Styles. </LI>
-<LI>On that page, use the mouse to "select" a tag name. The tag name is not literally
-selected, but when you click on an element in the example text, the list
-above it will display the type of element it is, and what its current colors are.</LI>
-<LI>For "tag name", select the bold check box. Then press Apply, and you should
-see the change take effect in your active editor.</LI>
-<LI>Select "Defaults" and make sure the tag names are set back to not bold.</LI>
-</UL>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<P><B>Double-Clicking Within the Source</B> <BR>
-(NOTE: if you continue to double-click at a given cursor position, the selection area will continue to expand. When the maximum region area has been reached, the next double-click will cause the original selection. So, the selections will wrap/cycle. <FONT color="#0000ff">Cool!</FONT>).</P>
-<UL>
-  <LI>Open <B>JobDesc.xml</B>.</LI>
-  <LI>Double-clicking within tag content:
-  <UL>
-    <LI>Double-click within <B>Middleware</B> on line 7.</LI>
-    <LI>Verify <B>Middleware</B> is selected in the Source and Design pages and <B>BusType</B> is selected in the Outline view. <FONT color="#ff0000">Not sure what the Properties view is supposed to show. It goes blank. See defect 177753. Also, <B>Middleware</B> wasn't selected in the Design page as had expected. The Design page only seems to stay in sync at the element/tag level like the Outline view. Talk to Craig about this.</FONT></LI>
-    <LI>Double-click again at the same cursor position.</LI>
-    <LI>Verify <B>Application and Middleware Software</B> is selected in the Source and Design pages and <B>BusType</B> remains to be the only thing selected in the Outline view.</LI>
-    <LI>Double-clicking again will cause cycling back to the original selection.</LI>
-  </UL></LI>
-  <LI>Double-clicking within a tag name:
-  <UL>
-    <LI>Double-click within <B>HowToApply</B> on line 61.</LI>
-    <LI>Verify <B>HowToApply</B> is selected in the Source page, Design page, and Outline view. 
-        <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in the 
-        Properties view. Only <B>distribute</B> should show a value.</LI>
-    <LI>Double-click again at the same cursor position.</LI>
-    <LI>Verify the whole <B>HowToApply</B> start tag (including its delimiters) is selected 
-        in the Source page. <B>HowToApply</B> should remain selected in
-        the Design page and Outline view. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
-    <LI>Double-clicking again will cause cycling back to the original selection.</LI>
-  </UL></LI>
-  <LI>Double-clicking within an attribute name:
-  <UL>
-    <LI>Type <B>Ctrl+End</B> to position the cursor at the end of the file.</LI>
-    <LI>Double-click within <B>distribute</B> on line 61. Verify <B>distribute</B> is selected 
-        in the Source page and <B>HowToApply</B> is selected in the Design page and Outline 
-        view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in 
-        the Properties view. Only <B>distribute</B> should show a value.</LI>
-    <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
-        selected in the Source. Nothing should change in the Design page or views.</LI>                 
-    <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views.<B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
-    <LI>Double-clicking again will cause cycling back to the original selection.</LI>
-  </UL></LI>
- <LI>Double-clicking within an attribute value:
-  <UL>
-    <LI>Type <B>Ctrl+Home</B> to position the cursor at the beginning of the file.</LI>
-    <LI>Scroll down such that line 61 is visible.</LI>
-    <LI>Double-click within <B>internal</B> on line 61. Verify <B>internal</B> is selected 
-        in the Source page and <B>HowToApply</B> is selected in the Design page and Outline 
-        view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in 
-        the Properties view. Only <B>distribute</B> should show a value.</LI>
-    <LI>Double-click at the same cursor position. Verify <B>"internal"</B> is
-        selected in the Source. Nothing should change in the Design page or views.</LI>
-    <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
-        selected in the Source. Nothing should change in the Design page or views.</LI>                 
-    <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
-    <LI>Double-clicking again will cause cycling back to the original selection.</LI>
-  </UL></LI>
-</UL>
-
-<P><B>Formatting a File Created by Different Editors</B><BR>
-<ul>
-<li>
-Import the <b>JobPosting.dtd</b> and <b>JobDesc.xml</b></li>
-
-<li>
-Open the JobDesc.xml. Check the source for indentation to see if it preserves
-the white space from the original document.</li>
-
-<li>
-The orignal document uses spaces and tabs, so the formatting will appear a little wrong.
-By using the right/left arrows, verify that some space is spaces and some space
-is tab characters.</li>
-<LI>Use 'format document' to be sure it formats. </LI>
-<LI>The default is to format with spaces ... verify only spaces remain in file, not tab charactes. 
-(Just a little movement with the arrow keys should suffice.</LI>
-<LI>Go to the preference page to change the format settings for the XML Editor
-to use the tab character instead of 4 spaces. While there, verify that the dialog
-will not allow other values to be intered except "whitespace" ...'\t's and blanks.
-</LI>
-<LI>Format the document again and be sure this time tab characters were used.</LI>
-</ul>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<!-- ===========================================================
-                           Other test cases
-     ===========================================================
--->
-<H2><B><FONT color="#0000ff">Other test cases</FONT></B></H2>
-<P><B>Associate the XML Editor to a new file type</B></P>
-<UL>
-  <LI>Window-&gt;Preferences<B></B>.</LI>
-  <LI>Expand <B>Workbench</B>.</LI>
-  <LI>Select <B>File Editors</B>.</LI>
-  <LI>Select the <B>Add</B> button to add a new file type.</LI>
-  <LI>Specify a file type of <B>*.set</B> and then close the Add dialog.</LI>
-  <LI>Verify <B>*.set</B> is selected in the list of file types.</LI>
-  <LI>Select the <B>Add</B> button to associate the XML Editor to the new file type.</LI>
-  <LI>Select <B>XML Editor</B> from the list of editors. Verify it appears with its own special icon. Close the dialog. <FONT color="#ff0000">NOTE: waiting to hear back from OTI on how can prevent 2 XML Editor entries from appearing in the list.</FONT></LI>
-  <LI>Verify <B>XML Editor</B> appears as the default editor now for the <B>*.set</B> file type.</LI>
-  <LI>Open <B>gotchaTCBeans.set</B> from the Navigator view. Verify it opens to the XML Editor.</LI>
-</UL>
-<P><FONT color="#0000ff">THE END!</FONT></P>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html
deleted file mode 100644
index 3bcdd14a3..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/LargeNonDefault.html
+++ /dev/null
@@ -1,665 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C/DTD/ HTML 4.01 Transitional//EN">
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta name="GENERATOR" content="Mozilla/4.7 [en] (WinNT; U) [Netscape]">
-<META content="text/css" http-equiv="Content-Style-Type">
-<title>smoke</title>
-</head>
-<body>
-<h2> Smoke Test - XML Editor</h2>
-Last updated: June 25, 2001
-<P>This Smoke Test primarily focuses on the RTP portion of the XML 
-Editior, which is the Source page of the XML Editor. It also performs 
-some integration testing. For example, it tests synchronization between 
-the Design and Source pages of the XML Editor, as well as with the 
-Outline and Properties views. It also verifies that files created 
-through the XML File wizard and references to the XML Catalog are 
-supported as expected.</P>
-<P><FONT color="#ff0000"><B>NOTE</B>: XML files are case-sensitive so be sure that things appear 
-exactly as noted.</FONT></P>
-
-<!-- ===========================================================
-                           Setup
-     ===========================================================
--->
-<H2><FONT color="#0000ff">Setup</FONT></H2>
-<P><B>Starting Clean</B></P>
-<ul>
-    <li> Delete any existing workbench</li>
-    <li> Start Eclipse</li>
-</ul>
-<P><B>Open an XML Perspective<BR>
-</B></P>
-<UL>
-    <LI>Select the <B>Open Perspective</B> toolbar button in the upper left</LI>
-    <LI>Select <B>Other...</B></LI>
-    <LI>Select <B>XML</B></LI>
-    <LI>Verify the following views appear in the XML perspective: <FONT color="#ff0000">The location of the Outline and Navigator views are reversed from the Resource and Web perspectives. Do we want to try to be consistent across the perspectives? Also, I opened <B>defect</B> 177664 to enable easy access to the Properties view from within the XML perspective. If this view isn't included in the Perspective because its use is limited, then recommend we at least provide a Show or Hide Properties View toolbar button (similar to the buttons that Page Designer provides).</FONT></LI>
-</UL>
-<P><B>Project Creation and File Imports<BR>
-</B></P>
-<UL>
-    <LI>Create a Project, <B>XMLTest2</B> </LI>
-    <LI>Import the following files into this project:
-    <UL>
-        <LI><B>PurchaseOrder.xsd</B></LI>
-        <LI><B>Invoice.dtd</B></LI>
-    <LI><B>JobDesc.xml</B></LI>
-    <LI><B>Wireless.xml</B></LI>
-    <LI><B>gotchaTCBeans.set</B></LI>
-    <LI><B>ATS.dtd</B></LI>
-    <LI><FONT color="#ff0000">any others?</FONT></LI>
-    </UL>
-    </LI>
-</UL>
-
-<!-- ===========================================================
-                    Create/Open/Edit test cases
-     ===========================================================
--->
-<H2><FONT color="#0000ff">Create/Open/Edit test cases</FONT></H2>
-<P><B>Create an XML File from scratch</B></P>
-<UL>
-    <LI>Select the <B>Create a new XML file</B> toolbar button.</LI>
-    <LI>Verify the Create a XML File wizard appears and the Finish button is disabled. <FONT color="#ff0000"><B>DEFECT:</B> 177660 - XML File wizard: disable Finish button on the first page</FONT>.</LI>
-    <LI>Accept the default to <B>Create a new XML file</B></LI>
-    <LI>Go to the Next page
-    <UL>
-        <LI>Select <B>XMLTest2</B> as the folder</LI>
-        <LI>Specify a File name of <B>fromScratch</B></LI>
-        <LI>Select <B>Finish</B></LI>
-    </UL>
-    </LI>
-    <LI>Verify the following:
-    <UL>
-        <LI>fromScratch.xml appears in the Navigator view.</LI>
-        <LI>fromScratch.xml is open to the Design page of the XML Editor and has focus.</LI>
-        <LI>the Design tab appears before the Source tab in the XML Editor.</LI>
-        <LI>the Design and Source page show no content.</LI>
-        <LI>the Outline and Properties views show nothing.</LI>
-    </UL>
-    </LI>
-    <LI>Switch to the Source page. Verify the cursor appears at the beginning of the file.</LI>
-    <LI>Right mouse button 2 and verify a popup menu appears.</LI>
-    <LI>Hit <B>Ctrl+Space</B>. Verify the content assist proposal list appears.</LI>
-    <LI>Select <B>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;</B></LI>
-    <LI>Verify &lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt; is inserted and appears syntax highlighted and an entry appears for it in the Outline view.</LI>
-    <LI>Position the cursor within the XML declaration and verify <B>version</B> and <B>encoding</B> appear in the Properties view. <FONT color="#ff0000">This used to work, but now it's not working. Opened <B>defect</B> 177662 - XML declaration attributes not appearing in Properties view. If we decide to not treat version and encoding as attributes, then this step should be removed.</FONT></LI>
-    <LI>Continue to the next section.</LI>
-</UL>
-<P><B>Identify a local DTD (</B>verifies a DTD is immediately recognized; in the past, you had to close and reopen the Workbench<B>)</B></P>
-<UL>
-    <LI>Type the following after the XML declaration in <B>fromScratch.xml</B>: <B>&lt;!DOCTYPE Invoice SYSTEM &quot;Invoice.dtd&quot;&gt;</B>. The text should be syntax highlighted as you type and you should see an entry get added to the Outline view.</LI>
-    <LI>Hit <B>Enter</B> to create a new line after the DOCTYPE declaration.</LI>
-    <LI>Hit <B>Ctrl+Space</B>.Verify only <B>Invoice</B> and <B>comment</B> appear in the proposal list. (<B>NOTE</B>: <B>Invoice</B> is the root element)</LI>
-    <LI>Hit <B>Enter</B> to accept <B>Invoice</B> as a selection. Verify the Invoice start and end tags are inserted into the Source and the cursor appears between them. An element entry should appear for Invoice in the Outline view. (<B>NOTE</B>: XML is case-sensitive so be sure you see Invoice and not invoice everywhere).</LI>
-    <LI>Hit <B>Ctrl+Space</B>. Verify the following appears in the proposal list (in the order shown): <FONT color="#ff0000">Item is appearing before Header. The default is not to sort the list alphabetically. That means the list should be sorted based on the order in which the child tags are defined in the element definition for Invoice in the DTD. In other words, users should see child tags listed according to their sequencing order in the DTD, which the DTD Editor shows. Violating the sequencing order causes an XML file to become not valid. <B>DEFECT:</B> 177668</FONT>
-    <UL>
-        <LI>Header</LI>
-        <LI>Item</LI>
-        <LI>comment</LI>
-    </UL>
-    </LI>
-    <LI>Hit <B>Enter</B> to accept <B>Header</B> as a selection.</LI>
-    <LI>Verify the Source now looks like the following and the cursor appears before <B>invoiceNumber</B>:<IMG border="0" height="83" src="identifyDTD.jpg" width="485"></LI>
-    <LI>Verify <B>Header</B> appears nested under <B>Invoice</B> in the Outline view.</LI>
-  <LI>Close this file, and respond <B>Yes</B> when prompted to save the changes.</LI>
-  <LI>Reopen the file and verify the changes were saved.</LI>
-  <LI>Close the file. Verify no save changes prompt appears.</LI>
-</UL>
-<P><B>Create an XML File from an imported DTD</B></P>
-<UL>
-    <LI>Select the <B>File-&gt;New-&gt;XML File</B>.</LI>
-    <LI>Verify the Create a XML File wizard appears.</LI>
-    <LI>Select to <B>Create a new XML file from a DTD file</B></LI>
-    <LI>Go to the Next page
-    <UL>
-        <LI>Select <B>XMLTest2</B> as the folder</LI>
-        <LI>Specify a File name of <B>fromLocalDTD</B></LI>
-        <LI>Go to the Next page</LI>
-    </UL>
-    </LI>
-    <LI>Select the <B>Import File</B> button
-    <UL>
-        <LI>Use the Browse button to find <B>testcase.dtd</B></LI>
-        <LI>Select <B>XMLTest2</B> as the folder. <FONT color="#ff0000">Would be nice if this were already filled in. Open a defect.</FONT></LI>
-        <LI>Select <B>Finish</B> to close the Import File wizard</LI>
-    </UL>
-    </LI>
-    <LI>Expand <B>XMLtest2</B> and then select <B>testcase.dtd</B>. <FONT color="#ff0000">Was expecting to see the imported file selected in the Workbench files list, but it wasn't. Open a defect.</FONT></LI>
-    <LI>Go to the Next page.</LI>
-    <LI>Select <B>testcase</B> as the Root Element.</LI>
-    <LI>Accept the default to <B>Create required content only</B>.</LI>
-    <LI>Verify <B>testcase.dtd</B> appears as the System Id.</LI>
-    <LI>Select Finish. Verify <B>fromLocalDTD.xml</B> appears in the XML Editor. Verify the Source page looks like the following: <IMG border="0" height="290" src="importDTD.jpg" width="660"></LI>
-  <LI>Verify the Outline view and the formatting indentation reflect the proper element/tag hierarchy. Here's what the Outline view should look like:<IMG border="0" height="297" src="outline1.jpg" width="655"></LI>
-  <LI>Verify selection synchronization between the Design page, Source page, Outline view, 
-        and Properties view.
-    <UL>
-        <LI>From the Source page, click within the <B>header</B> start tag. 
-            Verify <B>header</B> is selected in the Outline view and in the Design 
-            page and that the following properties and property values appear in the 
-            Properties view:
-        <TABLE border="1">
-            <TBODY>
-                <TR>
-                    <TD width="100"><B>Property</B></TD>
-                    <TD width="76"><B>Value</B></TD>
-                </TR>
-                <TR>
-                    <TD width="100">category</TD>
-                    <TD width="76">webtool</TD>
-                </TR>
-                <TR>
-                    <TD width="100">number</TD>
-                    <TD width="76">idvalue0</TD>
-                </TR>
-                <TR>
-                    <TD width="100">state</TD>
-                    <TD width="76">&nbsp;</TD>
-                </TR>
-                <TR>
-                    <TD width="100">subCategory</TD>
-                    <TD width="76">Accessability</TD>
-                </TR>
-                <TR>
-                    <TD width="100">subSubCategory</TD>
-                    <TD width="76">&nbsp;</TD>
-                </TR>
-            </TBODY>
-        </TABLE>
-        </LI>
-	<LI>From the Outline view, select the <B>testBucket</B> tag.
-            Verify <B>testBucket</B> is selected in the Design page and the current marker
-            in the lefthand margin of the Source page indicates the range of the 
-            <B>testBucket</B> tag. The Properties view should show a property of <B>type</B>
-            with a value of <B>ComponentTest</B>.
-        </LI>
-    </UL>   
-    </LI> 
-    <LI>Verify edit synchronization between the Design page, Source page, and 
-        Properties view (focus here is on adding attributes and attribute values).
-    <UL>
-        <LI>From the Source page, use content assist to insert an attribute and attribute value
-            for the <B>header</B> start tag.
-            <UL>
-            <LI>Position the cursor after the <B>category</B> attribute in the <B>header</B> start tag.</LI>
-            <LI>Type <B>space</B> and then hit prompt for content assist.</LI>
-            <LI>Verify only <B>state</B> and <B>subSubCategory</B> appear in the proposal list (content assist is smart enough not to list any attributes that already exist in the start tag since attributes can only appear once. <FONT color="#0000ff">Cool!</FONT>).</LI>
-            <LI>Select <B>state</B>.</LI>   
-            <LI>Verify <B>state="UnderConstruction"</B> is inserted in the Source page (content assist automatically inserts any default values. <FONT color="#0000ff">Cool!</FONT>). Verify the Design page and Properties view reflect this change.</LI>         
-            </UL>
-        </LI>
-        <LI>From the Properties view, update the <B>state</B> attribute value to "UnderReview" 
-            (a pulldown list of values should be available). Verify the change is reflected
-            in the Source and Design pages.
-        </LI>
-        <LI>From the Design page, add an attribute and attribute value to the <B>header</B> tag.
-            <UL>
-            <LI>Bring up the popup menu for the <B>header</B> tag.</LI>
-            <LI>Select <B>Add Attribute->subSubCategory</B> from the popup menu (it's smart
-                enough to know which attributes haven't been specified yet ... like content 
-                assist. Cool!).</LI>
-            <LI>Type in a value of <B>Keyboard support</B>.</LI>
-            <LI>Verify the change is reflected in the Source page and Properties view</LI>
-            </UL>
-        </LI>
-    </UL>
-    </LI>
-</UL>
-<P><B>Open an XML File that references a remote DTD</B></P>
-<UL>
-    <LI>Open the <B>Wireless.xml</B> file.</LI>
-    <LI>Verify it looks like the following in the Source page:<IMG border="0" height="239" src="wireless.jpg" width="656"></LI>
-    <LI>Verify the Outline view and the formatting indentation reflect the proper 
-        element/tag hierarchy. Here's what the Outline view should look like: <IMG border="0" height="189" src="outline2.jpg" width="656"></LI> 
-    <LI>Verify content assist <FONT color="#ff0000">Defect 176379 (in verify state, but still not working)</FONT>.</LI>
-        <UL>
-           <LI>Create a new line after the <B>wml</B> start tag.</LI>
-           <LI>Prompt for content assist on the new line.</LI>
-           <LI>Verify the following appear as proposals (in the order shown): 
-               <UL>
-                   <LI>head</LI>
-                   <LI>template</LI>
-                   <LI>card</LI>
-               </UL>
-           </LI>
-           <LI>Create a new line after the <B>wml</B> start tag.</LI>
-           <LI>Type a space before the ending delimiter on the card start tag.</LI>
-           <LI>Prompt for content assist</LI>
-           <LI>Verify the following appear as proposals (not necessarily in the
-               order shown). 
-               <UL>
-                   <LI>title</LI>
-                   <LI>newcontext</LI>
-                   <LI>ordered</LI>
-                   <LI>xml:lang</LI>
-                   <LI>onenterbackward</LI>
-                   <LI>ontimer</LI>
-                   <LI>id</LI>
-                   <LI>class</LI>
-               </UL>
-           </LI>
-           <LI>Position the cursor within the <B>method</B> attribute value in the <B>go</B> start tag.</LI>
-           <LI>Prompt for content assist</LI>
-           <LI>Verify <B>post</B> and <B>get</B> appear as proposals.</LI>
-        </UL>
-    <LI>Verify selection synchronization between the Design page, Source page, Outline view, 
-        and Properties view.
-    <UL>
-        <LI>From the Source page, click within the <B>card</B> start tag. 
-            Verify <B>card</B> is selected in the Outline view and in the Design 
-            page and that the content assist proposals listed above for the
-            <B>card</B> tag appear as properties in the Properties view. No values should appear for these properties.</LI>
-	<LI>From the Outline view, select the <B>postfield</B> tag.
-            Verify <B>postfield</B> is selected in the Design page and the current marker
-            in the lefthand margin of the Source page indicates the range of the 
-            <B>postfield</B> tag. The Properties view should show the following properties,
-            none of which should have a value:
-               <UL>
-                   <LI>name</LI>
-                   <LI>value</LI>
-                   <LI>id</LI>
-                   <LI>class</LI>
-               </UL>
-           </LI>
-    </UL>   
-    </LI>
-    <LI>Verify edit synchronization between the Design page, Source page, Outline view, and 
-        Properties view (focus here is on adding elements/tags).
-    <UL>
-        <LI>From the Source page, copy and paste the <B>card</B> tag.
-            <UL>
-            <LI>Position the cursor in the <B>card</B> start tag.</LI>
-            <LI>Notice the range of the <B>card</B> tag in the lefthand margin area.</LI>
-            <LI>Copy this range of lines using the <B>Edit->Copy</B> pulldown menu selection.</LI>
-            <LI>Paste after the <B>card</B> end tag using Ctrl+V.</LI>
-            <LI>Verify the appropriate lines were pasted n the Source page.
-                Verify the Design page, Outline view, and the Properties 
-                view reflect this change.</LI>         
-            </UL>
-        </LI>
-        <LI>From the Design page, add another <B>card</B> tag.
-            <UL>
-            <LI>Bring up the popup menu for the <B>wml</B> tag.</LI>
-            <LI>Select <B>Add Child->card</B> from the popup menu.</LI>
-            <LI>Verify the Source page, Outline view, and the Properties
-                view reflect this change. NOTE: it should have generated out
-                the same thing as the original card tag, with the exception
-                that a <B>method</B> attribute should not exist in the <B>go</B> start tag. </LI>
-            </UL>
-        </LI>
-    </UL>
-    </LI> 
-</UL>
-<P><B>Create and Validate an XML File from a schema</B><BR>
-
-<P>(these steps are taken from the 'Design' smoke test, except the Source Page is the focus)</P>
-<ul>
-<li>
-Right mouse button 2 on the PurchaseOrder.xsd and select <b>Create XML
-File</b>.</li>
-
-<li>
-Accept the default file names.</li>
-
-<li>
-In the Select Root Element page, choose <b>purchaseOrder</b> as root element.</li>
-
-<li>
-Choose <b>Create required and optional content</b> to create a minimal
-document.</li>
-
-<li>
-Enter <b>po</b> as the namespace prefix.</li>
-
-<li>On Finish, a PurchaseOrder.xml is created and the XML Editor is opened. (Select Source Page if not already there.)</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml should be invalid.</li>
-
-<li>
-Double click on the error message. It should be positioned to the line
-in error, i.e. the <b>partNum</b> attribute. It is invalid because the
-value is not set to match the XML schema pattern facet "d3-[A-Z]{2}" (3
-digits followed by 2 characters).</li>
-
-<li>In the Source View, locate the <b>partNum</b> attribute under element item.
-Enter the value 333-AB.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</UL>
-<UL>
-  <LI>
-  <HR></LI>
-  <li>Place the cursor after the &lt;items&gt; tag and besure "item" is 
-  listed in the content assist list. </li>
-<li>Rename the purchaseOrder.xsd to, say, purchaseOrderHOLD.xsd</li>
-<li>Verify that content assist still gives you "item" as above.</li>
-<li>Now select the "Reload Dependancies" button.</li>
-<li>Verify that now content assist no longer lists any items other 
-that the macro "comment".</li>
-<li>Repeat making purchaseOrder.xsd workable again.</li>
-</ul>
-<P></P><P></P><P></P><P></P><P></P></P>
-<P><B>Open an XML File for a shipped DTD catalog entry</B><BR>
-<BR>
-[put in optional section .. this isn't a customer scenerio]<BR>
-To verify that shipped DTDs are working:<BR>
-<UL>
-<LI>
-Use a web project with a standard web.xml file in it. Be sure 
-there is no web-app_2_2.dtd file in the directory. In the web.xml file 
-itself, mangle the web-app_2_2.dtd filename in the system id a little, such as 
-change it to xeb-app_2_2.dtd to be sure it can't be found via the
-normal http method (This isn't really necessary for the funtion to work,
-its just to be sure only the catalog function is in effect).
-</LI>
-<LI>
-Go to the preferences page, and open the XML Catalog. Verify there 
-is an entry for -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN.
-</LI>
-<LI>
-Once all the prep work is done (files deleted, text modified), you should 
-exit and restart Eclipse to be sure you have a fresh start.
-</LI>
-<LI>
-Open the web.xml file and be sure that content assist works for that file.
-For example, right after the end of the &lt;/display-name&gt; tag, ctrl-space 
-should provide a long list of elements, starting with servlet, servlet-mapping, etc.
-This indicates the shipped DTD function is working and configured 
-correctly (at least for the web.xml file).
-</LI>
-</UL>
-</P>
-<P><B>Create an XML File from a new DTD catalog entry</B><BR><IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<b>The following comes directly from the 'Design' Smoke Test: XML Catalog for XML Schema</b>
-<ul>
-<li>
-Run Validate on PurchaseOrder.xml to make sure it is valid</li>
-
-<li>
-Create a new project, XMLTest2</li>
-
-<li>
-Move the PurchaseOrder.xsd into XMLTest2.</li>
-
-<li>
-Run Validate on PurchaseOrder.xml. You will notice that it is no longer
-valid. The error message should give you a hint that the file PurchaseOrder.xsd
-can no longer be found.</li>
-
-<li>
-Open the Window->Preferences and select the XML Catalog.</li>
-
-<li>
-Enter the pair <b>Id = PurchaseOrder.xsd Uri = f:\eclipse\XMLTest2\PurchaseOrder.xsd</b></li>
-
-<br>Or alternatively, you can use a relative path to the install directory
-of the workbench as follows:
-<br><b>Id = PurchaseOrder.xsd Uri = .\XMLTest2\PurchaseOrder.xsd</b>
-<li>
-Click on the Reload button to reload the catalog settings.</li>
-
-<li>
-Run Validate. The PurchaseOrder.xml document should now be valid.</li>
-</ul>
-<!-- ===========================================================
-                      Save/Validate test cases
-     ===========================================================
--->
-<H2><FONT color="#0000ff">Save/Validate test cases</FONT></H2>
-<P><B>Saving an XML File</B><BR>
-(NOTE: the <B>Identify a local DTD</B> test case tests the save prompt on a file close.)</P>
-<UL>
-  <LI>If any files are open, select <B>File-&gt;Close All</B> (or <B>Ctrl+Shift+F4</B>) to close them.</LI>
-  <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
-  <LI>Verify the following (no-changes-made condition):
-  <UL>
-    <LI><B>File-&gt;Save</B> is disabled.</LI>
-    <LI><B>File-&gt;Save All</B> is disabled.</LI>
-    <LI><B>File-&gt;Save As</B> is enabled.</LI>
-    <LI>the <B>Save</B> toolbar button (a diskette) is disabled.</LI>
-    <LI>the <B>Save As</B> toolbar button is enabled.</LI>
-    <LI><B>Save</B> is disabled on the Source popup menu. <FONT color="#ff0000">Would be nice if the Design popup menu also had a Save selection. Open a suggestion defect.</FONT></LI>
-    <LI>no <B>*</B> appears in the file tab.</LI>
-  </UL></LI>
-  <LI>Make a change in the Source page.</LI>
-  <LI>Verify the following (changes-made condition):
-  <UL>
-    <LI><B>File-&gt;Save</B> is enabled.</LI>
-    <LI><B>File-&gt;Save All</B> is enabled</LI>
-    <LI>the <B>Save</B> toolbar button (a diskette) is enabled.</LI>
-    <LI><B>Save</B> is enabled on the Source popup menu.</LI>
-    <LI>a <B>*</B> appears in the file tab.</LI>
-  </UL></LI>
-  <LI>Hit <B>Ctrl+S</B>. </LI>
-  <LI>Verify the no-changes-made conditions apply.</LI>
-  <LI>Make a change in the Design page.</LI>
-  <LI>Verify the changes-made conditions apply.</LI>
-  <LI>File-&gt;Save All<B></B>.</LI>
-  <LI>Verify the no-changes-made conditions apply.</LI>
-  <LI>Make a change in the Properties view.</LI>
-  <LI>Verify the changes-made conditions apply.</LI>
-  <LI>Select <B>Save</B> from the Source popup menu.</LI>
-  <LI>Verify the no-changes-made conditions apply.</LI>
-  <LI>Close and then reopen the file.</LI>
-  <LI>Verify the changes that were made in the previous steps appear in the Design and Source pages.</LI>
-</UL>
-<P><B>Saving an XML File across multiple perspectives (optional)</B></P>
-<UL>
-  <LI>Open any xml file in the <B>XMLTest2</B> project.</LI>
-  <LI>Make a change to the file.</LI>
-  <LI>Open another XML Perspective by:
-  <UL>
-    <LI><B>selecting Perspective-&gt;Open-&gt;Other...</B></LI>
-    <LI>while holding down the <B>Shift</B> key, select <B>XML</B>.</LI>
-  </UL></LI>
-  <LI>Verify another XML Perspective button appears in the lefthand side of the Workbench to represent this second perspective.</LI>
-  <LI>Open the same xml file as in the first step above.</LI>
-  <LI>Verify the changes-made conditions apply in both XML Perspectives and verify that the changes made to the file in the first perspective appear in the same file in the second perspective. <FONT color="#ff0000">The * never appears in the file tab of the second perspective even when make changes to the file in the second perspective. Talk to David.</FONT></LI>
-  <LI>Make some changes to the file in the second perspective.</LI>
-  <LI>Verify these changes appear in the same file in the first perspective.</LI>
-  <LI>Close the file in the second perspective and respond <B>Yes</B> to the save changes prompt.</LI>
-  <LI>Verify the no-changes-made condition applies in the first perspective.</LI>
-</UL>
-<P><B>Validating a non well formed XML File (no DTD/Schema)</B><BR>
-(NOTE: it's important that the following be typed in. This test case tries to cover some of the more common errors that render an XML file as not being well-formed. It is not intended to verify that all possible errors are being detected and gracefully handled. )</P>
-<UL>
-  <LI>Select the <B>Create a new XML file</B> toolbar button.</LI><LI>Accept the default to <B>Create a new XML file</B></LI>
-  <LI>Go to the Next page
-    <UL>
-        <LI>Select <B>XMLTest2</B> as the folder</LI>
-        <LI>Specify a File name of <B>NonWellFormed</B></LI>
-        <LI>Select <B>Finish</B></LI>
-  </UL></LI>
-  <LI>Prompt for content assist.</LI>
-  <LI>Select <B>&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;.</B></LI>
-  <LI>Create a new line after the XML declaration.</LI>
-  <LI>Prompt for content assist.</LI>
-  <LI>Select comment.</LI>
-  <LI>Embed more than 2 consecutive dashes in the comment. 
-        <FONT color="#0000ff">(NOTE: more than 2 consecutive dashes can not be embedded within a comment)</FONT></LI>
-  <LI>Type in the remaining lines as shown below: 
-        <FONT color="#ff0000">(I can't show the lines until defect 177755 is fixed ... until then, here's the type of things that cause 
-        a document to not be well-formed):</FONT>
-  <UL>
-    <LI>create a start and end tag that don't match in their case sensitivity 
-        (e.g., &lt;tag&gt; and &lt;/Tag&gt;). </LI>
-    <LI>create a start and end tag where the start tag contains an attribute value that is not 
-        enclosed in quotes.
-        <FONT color="#0000ff">(NOTE: this is permitted in HTML, but not XML)</FONT></LI>
-    <LI>create tags that are not properly nested.
-        <FONT color="#0000ff">(NOTE: a child tag must be completed before its parent tag)</FONT></LI>
-    <LI>create a start tag without a corresonding end tag.
-        <FONT color="#0000ff">(NOTE: all start tags must have a corresponding end tag unless the 
-        tag is an empty tag, in which case the shorthand version can be used (&lt;shortTag/&gt;)).</FONT></LI>
-    <LI>do not provide an attribute value (=&quot;value&quot;).
-        <FONT color="#0000ff">(NOTE: this is permitted in HTML for those attributes that have 
-        only one value, but it's not valid in XML)</FONT></LI>
-     <LI>define an attribute more than once in a start tag.</LI>
-  </UL></LI>
-  <LI>Save the file.</LI>
-  <LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate 
-         lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations 
-         and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-  <LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-
-<P><B>Validate an XML File based on a DTD</B></P>
-<UL>
-<LI>Open <B>fromScratch.xml</B>.</LI>
-<LI>Delete a character from one of the start tags (mistyping a tag is not uncommon).</LI>
-<LI>Prompt for content assist within the bad tag. Verify a message appears in the status area
-of the Workbench indicating that the bad tag is an unknown tag.</LI>
-<LI>Select the <B>Validate</B> toolbar button.</LI>
-<LI>Verify an error appears in the Tasks view and an error marker appears in the Source page
-to flag the invalid tag.</LI>
-<LI>Select <B>Edit->Undo</B> from the Source page.</LI>
-<LI>Verify the bad tag error no longer appears in the Tasks view.</LI>
-<LI>Remove the <B>Header</B> end tag from the Source page.</LI>
-<LI>Save the file.</LI>
-<LI>Verify an error appears in the Tasks view indicating that the <B>Header</B> end tag is missing</LI>
-<LI>Close the file, responding <B>Yes</B> to the save changes prompt.</LI>
-<LI>Double-click on the error in the Tasks view, and verify <B>fromScratch.xml</B> opens to the
-appropriate line in the Source page of the XML Editor.</LI>
-<LI>Here's some other violations that can be attempted:
-<UL>
-<LI>Specify a bad attribute.</LI>
-<LI>Specify a bad attribute value.</LI>
-<LI>Specify child tags out of sequencing order</LI>
-<LI>Violate the occurrence indicator for a tag (e.g., if the DTD shows ?, then only
-0 or 1 occurrences of the tag is permitted).
-</UL></LI>
-<LI>Save the file.</LI>
-<LI>Verify errors are listed in the Tasks view for the above violations and that error markers appear on the appropriate 
-lines in the Source page. <FONT color="#ff0000">I'm not sure how the Design page handles any of these violations 
-and what will appear in the Outline and Properties view. Talk to Craig and David.</FONT></LI>
-<LI>Reopen the file and verify everything was saved.</LI>
-</UL>
-
-<!--  removed since done elsewhere as part of other scenerios
-<P><B>Validate an XML File based on a Schema</B><BR>
--->
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-
-<!-- ===========================================================
-                        Source Specific test cases
-     ===========================================================
--->
-<H2><B><FONT color="#0000ff">Source Specific test cases (optional)</FONT></B></H2>
-<P><B>Using the Auto Completion Content Assist Preference</B><BR>
-<UL>
-<LI>Open a any XML file that has enough tags to provide syntax hightlighting.</LI>
-<LI>While that file is left open, go to the Preferences page, select
-XML Editor, then Source Styles. </LI>
-<LI>On that page, use the mouse to "select" a tag name. The tag name is not literally
-selected, but when you click on an element in the example text, the list
-above it will display the type of element it is, and what its current colors are.</LI>
-<LI>For "tag name", select the bold check box. Then press Apply, and you should
-see the change take effect in your active editor.</LI>
-<LI>Select "Defaults" and make sure the tag names are set back to not bold.</LI>
-</UL>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<P><B>Double-Clicking Within the Source</B> <BR>
-(NOTE: if you continue to double-click at a given cursor position, the selection area will continue to expand. When the maximum region area has been reached, the next double-click will cause the original selection. So, the selections will wrap/cycle. <FONT color="#0000ff">Cool!</FONT>).</P>
-<UL>
-  <LI>Open <B>JobDesc.xml</B>.</LI>
-  <LI>Double-clicking within tag content:
-  <UL>
-    <LI>Double-click within <B>Middleware</B> on line 7.</LI>
-    <LI>Verify <B>Middleware</B> is selected in the Source and Design pages and <B>BusType</B> is selected in the Outline view. <FONT color="#ff0000">Not sure what the Properties view is supposed to show. It goes blank. See defect 177753. Also, <B>Middleware</B> wasn't selected in the Design page as had expected. The Design page only seems to stay in sync at the element/tag level like the Outline view. Talk to Craig about this.</FONT></LI>
-    <LI>Double-click again at the same cursor position.</LI>
-    <LI>Verify <B>Application and Middleware Software</B> is selected in the Source and Design pages and <B>BusType</B> remains to be the only thing selected in the Outline view.</LI>
-    <LI>Double-clicking again will cause cycling back to the original selection.</LI>
-  </UL></LI>
-  <LI>Double-clicking within a tag name:
-  <UL>
-    <LI>Double-click within <B>HowToApply</B> on line 61.</LI>
-    <LI>Verify <B>HowToApply</B> is selected in the Source page, Design page, and Outline view. 
-        <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in the 
-        Properties view. Only <B>distribute</B> should show a value.</LI>
-    <LI>Double-click again at the same cursor position.</LI>
-    <LI>Verify the whole <B>HowToApply</B> start tag (including its delimiters) is selected 
-        in the Source page. <B>HowToApply</B> should remain selected in
-        the Design page and Outline view. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
-    <LI>Double-clicking again will cause cycling back to the original selection.</LI>
-  </UL></LI>
-  <LI>Double-clicking within an attribute name:
-  <UL>
-    <LI>Type <B>Ctrl+End</B> to position the cursor at the end of the file.</LI>
-    <LI>Double-click within <B>distribute</B> on line 61. Verify <B>distribute</B> is selected 
-        in the Source page and <B>HowToApply</B> is selected in the Design page and Outline 
-        view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in 
-        the Properties view. Only <B>distribute</B> should show a value.</LI>
-    <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
-        selected in the Source. Nothing should change in the Design page or views.</LI>                 
-    <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views.<B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
-    <LI>Double-clicking again will cause cycling back to the original selection.</LI>
-  </UL></LI>
- <LI>Double-clicking within an attribute value:
-  <UL>
-    <LI>Type <B>Ctrl+Home</B> to position the cursor at the beginning of the file.</LI>
-    <LI>Scroll down such that line 61 is visible.</LI>
-    <LI>Double-click within <B>internal</B> on line 61. Verify <B>internal</B> is selected 
-        in the Source page and <B>HowToApply</B> is selected in the Design page and Outline 
-        view. <B>class</B>, <B>distribute</B>, <B>id</B>, and <B>name</B> should appear in 
-        the Properties view. Only <B>distribute</B> should show a value.</LI>
-    <LI>Double-click at the same cursor position. Verify <B>"internal"</B> is
-        selected in the Source. Nothing should change in the Design page or views.</LI>
-    <LI>Double-click at the same cursor position. Verify <B>distribute="internal"</B> is
-        selected in the Source. Nothing should change in the Design page or views.</LI>                 
-    <LI>Double-click at the same cursor position. Verify the whole <B>HowToApply</B> start tag is selected in the Source page (including its delimiters). Nothing should change in the Design page or views. <B><FONT color="#ff0000">HowToApply</FONT></B><FONT color="#ff0000"> and all descendents become selected in the Outline view (defect 177752). Also, the Properties view shows no properties (defect 177753).</FONT></LI>
-    <LI>Double-clicking again will cause cycling back to the original selection.</LI>
-  </UL></LI>
-</UL>
-
-<P><B>Formatting a File Created by Different Editors</B><BR>
-<ul>
-<li>
-Import the <b>JobPosting.dtd</b> and <b>JobDesc.xml</b></li>
-
-<li>
-Open the JobDesc.xml. Check the source for indentation to see if it preserves
-the white space from the original document.</li>
-
-<li>
-The orignal document uses spaces and tabs, so the formatting will appear a little wrong.
-By using the right/left arrows, verify that some space is spaces and some space
-is tab characters.</li>
-<LI>Use 'format document' to be sure it formats. </LI>
-<LI>The default is to format with spaces ... verify only spaces remain in file, not tab charactes. 
-(Just a little movement with the arrow keys should suffice.</LI>
-<LI>Go to the preference page to change the format settings for the XML Editor
-to use the tab character instead of 4 spaces. While there, verify that the dialog
-will not allow other values to be intered except "whitespace" ...'\t's and blanks.
-</LI>
-<LI>Format the document again and be sure this time tab characters were used.</LI>
-</ul>
-<IMG border="0" height="63" src="u011ani.gif" width="63"></P>
-<!-- ===========================================================
-                           Other test cases
-     ===========================================================
--->
-<H2><B><FONT color="#0000ff">Other test cases</FONT></B></H2>
-<P><B>Associate the XML Editor to a new file type</B></P>
-<UL>
-  <LI>Window-&gt;Preferences<B></B>.</LI>
-  <LI>Expand <B>Workbench</B>.</LI>
-  <LI>Select <B>File Editors</B>.</LI>
-  <LI>Select the <B>Add</B> button to add a new file type.</LI>
-  <LI>Specify a file type of <B>*.set</B> and then close the Add dialog.</LI>
-  <LI>Verify <B>*.set</B> is selected in the list of file types.</LI>
-  <LI>Select the <B>Add</B> button to associate the XML Editor to the new file type.</LI>
-  <LI>Select <B>XML Editor</B> from the list of editors. Verify it appears with its own special icon. Close the dialog. <FONT color="#ff0000">NOTE: waiting to hear back from OTI on how can prevent 2 XML Editor entries from appearing in the list.</FONT></LI>
-  <LI>Verify <B>XML Editor</B> appears as the default editor now for the <B>*.set</B> file type.</LI>
-  <LI>Open <B>gotchaTCBeans.set</B> from the Navigator view. Verify it opens to the XML Editor.</LI>
-</UL>
-<P><FONT color="#0000ff">THE END!</FONT></P>
-</body>
-</html>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/MultiNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/MultiNonDefault.html
deleted file mode 100644
index f7721130e..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/MultiNonDefault.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
-	<FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
-	<FRAMESET cols="160,*">
-		<FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
-		<FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
-	</FRAMESET>
-	<NOFRAMES>
-	<BODY>
-	<P>To view this page, you need a browser that supports frames.</P>
-	</BODY>
-	</NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NoEncoding.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NoEncoding.html
deleted file mode 100644
index 070e4fe3c..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NoEncoding.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
-	<FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
-	<FRAMESET cols="160,*">
-		<FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
-		<FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
-	</FRAMESET>
-	<NOFRAMES>
-	<BODY>
-	<P>To view this page, you need a browser that supports frames.</P>
-	</BODY>
-	</NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NormalNonDefault.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NormalNonDefault.html
deleted file mode 100644
index ba30c9f7d..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/NormalNonDefault.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
-	<FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
-	<FRAMESET cols="160,*">
-		<FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
-		<FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
-	</FRAMESET>
-	<NOFRAMES>
-	<BODY>
-	<P>To view this page, you need a browser that supports frames.</P>
-	</BODY>
-	</NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotes.html b/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotes.html
deleted file mode 100644
index 254cde4d3..000000000
--- a/tests/org.eclipse.wst.html.tests.encoding/testfiles/html/noquotes.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<HEAD>
-<META http-equiv="Content-Style-Type" content="text/css">
-<META http-equiv="Content-Type" content=text/html; charset=UTF-8>
-<META http-equiv="Content-Type" content="text/html; charset=ISO-8859-6">
-<META name="GENERATOR" content="IBM WebSphere Studio">
-<TITLE>IBM WebSphere Samples Gallery</TITLE>
-</HEAD>
-<FRAMESET rows="75,*">
-	<FRAME name="title" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Title.html" scrolling="NO" noresize>
-	<FRAMESET cols="160,*">
-		<FRAME name="menu" marginwidth="0" marginheight="0" frameborder="0" src="Menu/Menu.html" scrolling="auto" noresize>
-		<FRAME name="main" marginwidth="0" marginheight="0" frameborder="0" src="Menu/SamplesIntro.html" scrolling="auto" noresize>
-	</FRAMESET>
-	<NOFRAMES>
-	<BODY>
-	<P>To view this page, you need a browser that supports frames.</P>
-	</BODY>
-	</NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/tests/org.eclipse.wst.html.ui.tests/.classpath b/tests/org.eclipse.wst.html.ui.tests/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.html.ui.tests/.cvsignore b/tests/org.eclipse.wst.html.ui.tests/.cvsignore
deleted file mode 100644
index ec1ea6044..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-bin.project
-build.xml
-htmluitests.jar
-temp.folder
diff --git a/tests/org.eclipse.wst.html.ui.tests/.project b/tests/org.eclipse.wst.html.ui.tests/.project
deleted file mode 100644
index a9f401f39..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.html.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.html.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5cef..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac6532..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f72495846..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 04516c2b4..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.html.ui.tests; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: htmluitests.jar
-Bundle-Activator: org.eclipse.wst.html.ui.tests.HTMLUITestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.html.ui.tests,
- org.eclipse.wst.html.ui.tests.viewer
-Require-Bundle: org.eclipse.ui,
- org.eclipse.jface.text,
- org.eclipse.wst.html.ui,
- org.eclipse.wst.xml.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.html.core,
- org.eclipse.wst.xml.core,
- org.eclipse.wst.sse.core,
- org.eclipse.ui.workbench.texteditor,
- org.junit,
- org.eclipse.ui.views,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- com.ibm.icu
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.wst.html.ui.tests/about.html b/tests/org.eclipse.wst.html.ui.tests/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.wst.html.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.html.ui.tests/build.properties b/tests/org.eclipse.wst.html.ui.tests/build.properties
deleted file mode 100644
index a23f581e7..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/build.properties
+++ /dev/null
@@ -1,19 +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
-###############################################################################
-bin.includes = plugin.xml,\
-               test.xml,\
-               htmluitests.jar,\
-               META-INF/,\
-               about.html,\
-               icons/
-jars.compile.order = htmluitests.jar
-source.htmluitests.jar = src/
-output.htmluitests.jar = bin/
diff --git a/tests/org.eclipse.wst.html.ui.tests/icons/sourceEditor.gif b/tests/org.eclipse.wst.html.ui.tests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb858..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/icons/sourceEditor.gif
+++ /dev/null
diff --git a/tests/org.eclipse.wst.html.ui.tests/plugin.properties b/tests/org.eclipse.wst.html.ui.tests/plugin.properties
deleted file mode 100644
index ec6182265..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# properties file for org.eclipse.wst.html.ui.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Structured Source Editor for HTML Tests
-view.name.0 = Embedded HTML Structured Text Viewer
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/plugin.xml b/tests/org.eclipse.wst.html.ui.tests/plugin.xml
deleted file mode 100644
index ff9dcb36f..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.ui.views">
-		<view
-			name="%view.name.0"
-			icon="$nl$/icons/sourceEditor.gif"
-			category="org.eclipse.wst.sse.ui.tests"
-			class="org.eclipse.wst.html.ui.tests.viewer.ViewerTestHTML"
-			id="org.eclipse.wst.html.ui.tests.viewer.ViewerTestHTML">
-		</view>
-	</extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java
deleted file mode 100644
index 2a662aff2..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUIPreferencesTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.html.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.wst.html.ui.internal.HTMLUIPlugin;
-import org.eclipse.wst.html.ui.internal.preferences.HTMLUIPreferenceNames;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * The purpose of this test is to verify the validity of the HTML Source
- * editor preferences. Tests include setting/getting preferences.
- * 
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class HTMLUIPreferencesTest extends TestCase {
-	/**
-	 * Tests existance of preference values when getting preference values
-	 * through Platform.getPreferencesService()
-	 */
-	public void testBundleGetPreferences() {
-		final String bundleName = "org.eclipse.wst.html.ui";
-
-		// need to start up bundle for default values to be loaded
-		Bundle bundle = Platform.getBundle(bundleName);
-		try {
-			if (bundle != null)
-				bundle.start();
-			else
-				fail("Get preference value failed because could not find bundle: " + bundleName);
-		} catch (BundleException e) {
-			fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
-		}
-
-		bundleGetPreference(bundleName, HTMLUIPreferenceNames.AUTO_PROPOSE);
-		bundleGetPreference(bundleName, HTMLUIPreferenceNames.AUTO_PROPOSE_CODE);
-	}
-
-	private void bundleGetPreference(String bundleName, String prefKey) {
-		String defaultValue = Long.toString(System.currentTimeMillis()); // random
-																			// string
-
-		String value = Platform.getPreferencesService().getString(bundleName, prefKey, defaultValue, null);
-		assertNotSame("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue, value);
-	}
-
-	/**
-	 * Tests default values of preferences.
-	 * 
-	 * NOTE: Expected default values are hard-coded, so if default values do
-	 * get changed, assertions need to be updated as well
-	 */
-	public void testPluginGetDefaultPreferences() {
-		IPreferenceStore store = HTMLUIPlugin.getDefault().getPreferenceStore();
-
-		pluginGetDefaultPreference(store, HTMLUIPreferenceNames.AUTO_PROPOSE, Boolean.toString(true));
-		pluginGetDefaultPreference(store, HTMLUIPreferenceNames.AUTO_PROPOSE_CODE, "<");
-	}
-
-	private void pluginGetDefaultPreference(IPreferenceStore store, String prefKey, String expected) {
-		String defaultValue = store.getDefaultString(prefKey);
-		assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, defaultValue);
-	}
-
-	/**
-	 * Tests setting preference values by setting preference value to be a
-	 * certain value, then getting the preference value to verify it was set.
-	 */
-	public void testPluginSetPreferences() {
-		IPreferenceStore store = HTMLUIPlugin.getDefault().getPreferenceStore();
-
-		pluginSetPreferenceBoolean(store, HTMLUIPreferenceNames.AUTO_PROPOSE);
-		pluginSetPreferenceString(store, HTMLUIPreferenceNames.AUTO_PROPOSE_CODE);
-	}
-
-	private void pluginSetPreferenceBoolean(IPreferenceStore store, String prefKey) {
-		boolean originalValue = store.getBoolean(prefKey);
-		boolean expectedValue = !originalValue;
-		store.setValue(prefKey, expectedValue);
-		boolean foundValue = store.getBoolean(prefKey);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		store.setValue(prefKey, originalValue);
-	}
-
-	private void pluginSetPreferenceString(IPreferenceStore store, String prefKey) {
-		String originalValue = store.getString(prefKey);
-		String expectedValue = Long.toString(System.currentTimeMillis()); // random
-																			// string
-		store.setValue(prefKey, expectedValue);
-		String foundValue = store.getString(prefKey);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		store.setValue(prefKey, originalValue);
-	}
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java
deleted file mode 100644
index 3353690e6..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestSuite.java
+++ /dev/null
@@ -1,34 +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.html.ui.tests;
-
-import org.eclipse.wst.html.ui.tests.viewer.TestViewerConfigurationHTML;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-
-public class HTMLUITestSuite extends junit.framework.TestSuite {
-	public static Test suite() {
-		return new HTMLUITestSuite();
-	}
-
-	public HTMLUITestSuite() {
-		super("HTML UI TestSuite");
-		addTest(new TestSuite(VerifyEditorPlugin.class));
-		addTest(new TestSuite(HTMLUIPreferencesTest.class));
-		addTest(new TestSuite(TestViewerConfigurationHTML.class));
-		addTest(new TestSuite(TestEditorConfigurationHTML.class));
-		//		addTest(new SSEModelTestSuite());
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestsPlugin.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestsPlugin.java
deleted file mode 100644
index cecaec3c5..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/HTMLUITestsPlugin.java
+++ /dev/null
@@ -1,68 +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.html.ui.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class HTMLUITestsPlugin extends Plugin {
-	//The shared instance.
-	private static HTMLUITestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public HTMLUITestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.html.ui.tests.SSEForHTMLTestsPluginResources");
-		}
-		catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static HTMLUITestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = HTMLUITestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java
deleted file mode 100644
index c5c53ac12..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/Logger.java
+++ /dev/null
@@ -1,144 +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.html.ui.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.html.ui.tests"; //$NON-NLS-1$
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * Adds message to log.
-	 * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message text to add to the log
-	 * @param exception exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * @param message text to print
-	 * @param category category of the message, to be compared with /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java
deleted file mode 100644
index b3378d47f..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/TestEditorConfigurationHTML.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- * 
- * Contributors:
- *   IBM - Initial API and implementation
- *   Jens Lukowski/Innoopract - initial renaming/restructuring
- * 
- */
-package org.eclipse.wst.html.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
-import org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-import org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration;
-
-/**
- * Tests retrieving editor contributions for html content type
- */
-public class TestEditorConfigurationHTML extends TestCase {
-	public void testGetSourceViewerConfiguration() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.SOURCEVIEWERCONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
-		assertNotNull("no source viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected source viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), StructuredTextViewerConfigurationHTML.class);
-	}
-
-	public void testGetContentOutlineViewerConfiguration() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.CONTENTOUTLINECONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
-		assertNotNull("no content outline viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected content outline viewer configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), HTMLContentOutlineConfiguration.class);
-	}
-
-	public void testGetPropertySheetConfiguration() {
-		Object o = ExtendedConfigurationBuilder.getInstance().getConfiguration(ExtendedConfigurationBuilder.PROPERTYSHEETCONFIGURATION, ContentTypeIdForHTML.ContentTypeID_HTML);
-		assertNotNull("no property sheet configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o);
-		// check for over-qualified subclasses
-		assertEquals("unexpected property sheet configuration for " + ContentTypeIdForHTML.ContentTypeID_HTML, o.getClass(), XMLPropertySheetConfiguration.class);
-	}
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java
deleted file mode 100644
index f3a0bbf00..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/VerifyEditorPlugin.java
+++ /dev/null
@@ -1,32 +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.html.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.html.ui.internal.HTMLUIPlugin;
-
-
-public class VerifyEditorPlugin extends TestCase {
-
-	public void testPluginExists() {
-		// TODO: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=81527
-		assertTrue(true);
-		Plugin plugin = null;
-		try {
-			plugin = HTMLUIPlugin.getInstance();
-		}
-		catch (Exception e) {
-			plugin = null;
-		}
-		assertNotNull("editor plugin could not be instantiated", plugin);
-	}
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java
deleted file mode 100644
index 319721f3a..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/TestViewerConfigurationHTML.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package org.eclipse.wst.html.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.IAnnotationHover;
-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.PlatformUI;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
-import org.eclipse.wst.html.ui.tests.Logger;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-/**
- * @author pavery
- */
-public class TestViewerConfigurationHTML extends TestCase {
-    
-	private StructuredTextViewerConfigurationHTML fConfig = null;
-	private boolean fDisplayExists = true;
-	private StructuredTextViewer fViewer = null;
-	private boolean isSetup = false;
-	
-    public TestViewerConfigurationHTML() {
-        super("TestViewerConfigurationHTML");
-    }
-    protected void setUp() throws Exception {
-		
-    	super.setUp();
-		if(!this.isSetup){
-			setUpViewerConfiguration();
-			this.isSetup = true;
-		}
-    }
-	
-	private void setUpViewerConfiguration() {
-
-		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
-			fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-			fConfig = new StructuredTextViewerConfigurationHTML();
-		}
-		else {
-			fDisplayExists = false;
-			Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
-		}
-	}
-    
-	/**
-	 * Not necessary
-	 */
-	public void testGetAnnotationHover() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IAnnotationHover hover = fConfig.getAnnotationHover(fViewer);
-		assertNotNull("AnnotationHover is null", hover);
-    }
-	
-	public void testGetAutoEditStrategies() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IHTMLPartitions.HTML_DEFAULT);
-		assertNotNull(strategies);
-		assertTrue("there are no auto edit strategies", strategies.length>0);
-	}
-	
-	public void testGetConfiguredContentTypes() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		assertNotNull(configuredContentTypes);
-		assertTrue("there are no configured content types", configuredContentTypes.length > 1);
-	}
-	
-	/**
-	 * Not necessary
-	 */
-	public void testGetContentAssistant() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IContentAssistant ca = fConfig.getContentAssistant(fViewer);
-		assertNotNull("there is no content assistant", ca);
-	}
-	
-	public void testGetContentFormatter() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IContentFormatter cf = fConfig.getContentFormatter(fViewer);
-		assertNotNull("there is no content formatter", cf);
-	}
-	
-	public void testGetDoubleClickStrategy() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
-			if(strategy != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured double click strategies", false);
-	}
-	
-	public void testGetHyperlinkDetectors() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
-		assertNotNull("there are no hyperlink detectors", detectors);
-		assertTrue("there are no hyperlink detectors", detectors.length > 1);
-	}
-	
-    public void testGetIndentPrefixes() {
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			String prefixes[] = fConfig.getIndentPrefixes(fViewer, contentTypes[i]);
-			if(prefixes != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured indent prefixes", false);
-	}
-    
-	/**
-	 * Not necessary
-	 */
-    public void testGetInformationControlCreator() {
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IInformationControlCreator infoCreator = fConfig.getInformationControlCreator(fViewer);
-		assertNotNull("InformationControlCreator is null", infoCreator);
-    }
-	
-	/**
-	 * Not necessary
-	 */
-	public void testGetInformationPresenter() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
-		assertNotNull("InformationPresenter is null", presenter);
-	}
-	
-	public void testGetLineStyleProviders() {
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
-			if(providers != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured line style providers", false);
-	}
-	
-	/**
-	 * Not necessary
-	 */
-	public void testGetReconciler() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-		
-		IReconciler r = fConfig.getReconciler(fViewer);
-		assertNotNull("Reconciler is null", r);
-	}
-	
-	public void testGetTextHover() {
-		
-		// probably no display
-		if(!fDisplayExists)
-			return;
-
-		String[] hoverPartitions = new String[]{IHTMLPartitions.HTML_DEFAULT, IHTMLPartitions.SCRIPT};
-		for (int i = 0; i < hoverPartitions.length; i++) {
-			ITextHover hover = fConfig.getTextHover(fViewer, hoverPartitions[i], SWT.NONE);
-			assertNotNull("hover was null for partition: " + hoverPartitions[i], hover);
-		}
-	}
-}
diff --git a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java b/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java
deleted file mode 100644
index 54b9892bc..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/src/org/eclipse/wst/html/ui/tests/viewer/ViewerTestHTML.java
+++ /dev/null
@@ -1,496 +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.html.ui.tests.viewer;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.html.core.internal.provisional.contenttype.ContentTypeIdForHTML;
-import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.w3c.dom.Attr;
-
-public class ViewerTestHTML extends ViewPart {
-	private final String SSE_EDITOR_FONT = "org.eclipse.wst.sse.ui.textfont";
-	private final String DEFAULT_VIEWER_CONTENTS = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n<HTML>\n	<HEAD>\n		<META http-equiv=\"Content-Type\" content=\"text/html; charset=ISO-8859-1\">\n		<TITLE>place title here</TITLE>\n	</HEAD>\n	<BODY>\n		place content here	\n<script>\n\"text\";\n</SCRIPT>\n</BODY>\n</HTML>";
-
-	private StructuredTextViewer fSourceViewer = null;
-	private StructuredTextViewerConfiguration fConfig = null;
-	private IContentOutlinePage fContentOutlinePage = null;
-	private ISelectionChangedListener fHighlightRangeListener = null;
-
-	/**
-	 * Sets the viewer's highlighting text range to the text range indicated
-	 * by the selected Nodes.
-	 */
-	protected class NodeRangeSelectionListener implements ISelectionChangedListener {
-		public void selectionChanged(SelectionChangedEvent event) {
-			if (!event.getSelection().isEmpty() && event.getSelection() instanceof IStructuredSelection) {
-				IStructuredSelection selection = (IStructuredSelection) event.getSelection();
-				IndexedRegion startNode = (IndexedRegion) selection.getFirstElement();
-				IndexedRegion endNode = (IndexedRegion) selection.toArray()[selection.size() - 1];
-
-				if (startNode instanceof Attr)
-					startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
-				if (endNode instanceof Attr)
-					endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
-				int start = startNode.getStartOffset();
-				int end = endNode.getEndOffset();
-
-				fSourceViewer.resetVisibleRegion();
-				fSourceViewer.setVisibleRegion(start, end - start);
-				fSourceViewer.setSelectedRange(start, 0);
-			}
-			else {
-				fSourceViewer.resetVisibleRegion();
-			}
-		}
-	}
-
-	protected class NumberInputDialog extends Dialog {
-		public NumberInputDialog(Shell shell) {
-			super(shell);
-		}
-
-		public Text start;
-		int startValue;
-		public Text length;
-		int lengthValue;
-
-		protected Control createDialogArea(Composite parent) {
-			Composite composite = (Composite) super.createDialogArea(parent);
-			Composite container = new Composite(composite, SWT.NULL);
-			container.setLayoutData(new GridData(GridData.FILL_BOTH));
-			container.setLayout(new GridLayout(2, true));
-			setShellStyle(getShell().getStyle() | SWT.RESIZE);
-
-			Label label = new Label(container, SWT.NULL);
-			label.setText("Start");
-			label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			label = new Label(container, SWT.NULL);
-			label.setText("Length");
-			label.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			start = new Text(container, SWT.BORDER);
-			startValue = fSourceViewer.getVisibleRegion().getOffset();
-			start.setText("" + startValue);
-			start.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			length = new Text(container, SWT.BORDER);
-			lengthValue = fSourceViewer.getVisibleRegion().getLength();
-			length.setText("" + lengthValue);
-			length.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			//			start.addModifyListener(new ModifyListener() {
-			//				public void modifyText(ModifyEvent e) {
-			//					if (e.widget == start) {
-			//						try {
-			//							startValue = Integer.decode(start.getText()).intValue();
-			//						}
-			//						catch (NumberFormatException e2) {
-			//							startValue = 0;
-			//						}
-			//					}
-			//				}
-			//			});
-			//			length.addModifyListener(new ModifyListener() {
-			//				public void modifyText(ModifyEvent e) {
-			//					if (e.widget == length) {
-			//						try {
-			//							lengthValue = Integer.decode(length.getText()).intValue();
-			//						}
-			//						catch (NumberFormatException e2) {
-			//							lengthValue = 0;
-			//						}
-			//					}
-			//				}
-			//			});
-
-			return composite;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.dialogs.Dialog#okPressed()
-		 */
-		protected void okPressed() {
-			try {
-				startValue = Integer.decode(start.getText()).intValue();
-			}
-			catch (NumberFormatException e2) {
-				startValue = 0;
-			}
-			try {
-				lengthValue = Integer.decode(length.getText()).intValue();
-			}
-			catch (NumberFormatException e2) {
-				lengthValue = 0;
-			}
-			super.okPressed();
-		}
-	}
-
-	protected void addActions(IContributionManager mgr) {
-		if (mgr != null) {
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "New HTML";
-				}
-
-				public void run() {
-					super.run();
-					BusyIndicator.showWhile(getSite().getShell().getDisplay(), new Runnable() {
-						public void run() {
-							setupViewerForNew();
-							fSourceViewer.setEditable(true);
-						}
-					});
-				}
-			});
-			mgr.add(new Separator());
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Change Visibility";
-				}
-
-				public void run() {
-					super.run();
-					NumberInputDialog dlg = new NumberInputDialog(fSourceViewer.getControl().getShell());
-					int proceed = dlg.open();
-					if (proceed == Window.CANCEL)
-						return;
-					fSourceViewer.resetVisibleRegion();
-					fSourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Show All";
-				}
-
-				public void run() {
-					super.run();
-					fSourceViewer.resetVisibleRegion();
-				}
-			});
-			mgr.add(new Separator());
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Change Visibility in Editor";
-				}
-
-				public void run() {
-					super.run();
-					StructuredTextViewer sourceViewer = null;
-					IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-					if (part != null && part instanceof StructuredTextEditor) {
-						sourceViewer = ((StructuredTextEditor) part).getTextViewer();
-					}
-					if (sourceViewer != null) {
-						NumberInputDialog dlg = new NumberInputDialog(sourceViewer.getControl().getShell());
-						int proceed = dlg.open();
-						if (proceed == Window.CANCEL)
-							return;
-						sourceViewer.resetVisibleRegion();
-						sourceViewer.setVisibleRegion(dlg.startValue, dlg.lengthValue);
-					}
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Show All in Editor";
-				}
-
-				public void run() {
-					super.run();
-					StructuredTextViewer sourceViewer = null;
-					IEditorPart part = getViewSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-					if (part != null && part instanceof StructuredTextEditor) {
-						sourceViewer = ((StructuredTextEditor) part).getTextViewer();
-					}
-					if (sourceViewer != null) {
-						sourceViewer.resetVisibleRegion();
-					}
-				}
-			});
-			mgr.add(new Separator());
-			// no longer able to set input to NULL
-			//			mgr.add(new Action() {
-			//				public String getText() {
-			//					return getToolTipText();
-			//				}
-			//
-			//				public String getToolTipText() {
-			//					return "Set Input to NULL";
-			//				}
-			//				public void run() {
-			//					super.run();
-			//					viewer.setInput(null);
-			//				}
-			//			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input from Active Editor";
-				}
-
-				public void run() {
-					super.run();
-					ITextEditor textEditor = getActiveEditor();
-					if (textEditor != null) {
-						setupViewerForEditor(textEditor);
-						fSourceViewer.setEditable(true);
-					}
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input and Follow Selection";
-				}
-
-				public void run() {
-					super.run();
-					followSelection();
-					fSourceViewer.setEditable(true);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Take Input and Follow Selection As ReadOnly";
-				}
-
-				public void run() {
-					super.run();
-					followSelection();
-					fSourceViewer.setEditable(false);
-				}
-			});
-			mgr.add(new Action() {
-				public String getText() {
-					return getToolTipText();
-				}
-
-				public String getToolTipText() {
-					return "Stop Following Selection";
-				}
-
-				public void run() {
-					super.run();
-					stopFollowSelection();
-				}
-			});
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		IContributionManager mgr = getViewSite().getActionBars().getMenuManager();
-		addActions(mgr);
-
-		// create source viewer & its content type-specific viewer
-		// configuration
-		fSourceViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-		fConfig = new StructuredTextViewerConfigurationHTML();
-
-		// set up the viewer with a document & viewer config
-		setupViewerForNew();
-
-		setupViewerPreferences();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		stopFollowSelection();
-		fSourceViewer.unconfigure();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		if (fSourceViewer.getControl() != null && !fSourceViewer.getControl().isDisposed())
-			fSourceViewer.getControl().setFocus();
-	}
-
-	/**
-	 * @see org.eclipse.ui.IViewPart#init(IViewSite, IMemento)
-	 */
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-	}
-
-	/**
-	 * Set up source viewer with any additional preferences it should have Ex:
-	 * font, tab width
-	 */
-	private void setupViewerPreferences() {
-		fSourceViewer.getTextWidget().setFont(JFaceResources.getFont(SSE_EDITOR_FONT));
-	}
-
-	/**
-	 * Set up source viewer with a new document & configure it
-	 */
-	private void setupViewerForNew() {
-		stopFollowSelection(); // if was following selection, stop
-
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IDocument doc = modelManager.createStructuredDocumentFor(ContentTypeIdForHTML.ContentTypeID_HTML);
-		doc.set(DEFAULT_VIEWER_CONTENTS);
-
-		fSourceViewer.setDocument(doc);
-		// need to reconfigure after set document just so highlighter works
-		fSourceViewer.configure(fConfig);
-	}
-
-	/**
-	 * Returns the current active text editor if possible
-	 * 
-	 * @return ITextEditor
-	 */
-	private ITextEditor getActiveEditor() {
-		ITextEditor editor = null;
-		IEditorPart editorPart = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-		if (editorPart instanceof ITextEditor)
-			editor = (ITextEditor) editorPart;
-		if (editor == null && editorPart != null)
-			editor = (ITextEditor) editorPart.getAdapter(ITextEditor.class);
-		return editor;
-	}
-
-	/**
-	 * Sets up the viewer with the same document/input as the given editor
-	 * 
-	 * @param ITextEditor
-	 *            editor - the editor to use *cannot to be null*
-	 */
-	private void setupViewerForEditor(ITextEditor editor) {
-		stopFollowSelection(); // if was following selection, stop
-		IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
-		fSourceViewer.setDocument(doc);
-
-		// need to reconfigure after set document just so highlighter works
-		fSourceViewer.configure(new StructuredTextViewerConfigurationHTML());
-	}
-
-	/**
-	 * Hooks up the viewer to follow the selection made in the active editor
-	 */
-	private void followSelection() {
-		ITextEditor editor = getActiveEditor();
-		if (editor != null) {
-			setupViewerForEditor(editor);
-			if (fHighlightRangeListener == null)
-				fHighlightRangeListener = new NodeRangeSelectionListener();
-
-			fContentOutlinePage = ((IContentOutlinePage) editor.getAdapter(IContentOutlinePage.class));
-			if (fContentOutlinePage != null) {
-				fContentOutlinePage.addSelectionChangedListener(fHighlightRangeListener);
-
-				if (!fContentOutlinePage.getSelection().isEmpty() && fContentOutlinePage.getSelection() instanceof IStructuredSelection) {
-					fSourceViewer.resetVisibleRegion();
-
-					Object[] nodes = ((IStructuredSelection) fContentOutlinePage.getSelection()).toArray();
-					IndexedRegion startNode = (IndexedRegion) nodes[0];
-					IndexedRegion endNode = (IndexedRegion) nodes[nodes.length - 1];
-
-					if (startNode instanceof Attr)
-						startNode = (IndexedRegion) ((Attr) startNode).getOwnerElement();
-					if (endNode instanceof Attr)
-						endNode = (IndexedRegion) ((Attr) endNode).getOwnerElement();
-
-					int start = startNode.getStartOffset();
-					int end = endNode.getEndOffset();
-
-					fSourceViewer.setVisibleRegion(start, end - start);
-					fSourceViewer.setSelectedRange(start, 0);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Cease following the selection made in the editor
-	 */
-	private void stopFollowSelection() {
-		if (fContentOutlinePage != null) {
-			fContentOutlinePage.removeSelectionChangedListener(fHighlightRangeListener);
-			fSourceViewer.resetVisibleRegion();
-			fContentOutlinePage = null;
-		}
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.html.ui.tests/test.xml b/tests/org.eclipse.wst.html.ui.tests/test.xml
deleted file mode 100644
index 2ba6ac286..000000000
--- a/tests/org.eclipse.wst.html.ui.tests/test.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-	<property
-		name="plugin-name"
-		value="org.eclipse.wst.html.ui.tests" />
-    <property
-        name="classname"
-        value="org.eclipse.wst.html.ui.tests.HTMLUITestSuite" />
-    <property
-        name="testType"
-        value="ui-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/.classpath b/tests/org.eclipse.wst.sse.core.tests/.classpath
deleted file mode 100644
index 1d8baf770..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.sse.core.tests/.cvsignore b/tests/org.eclipse.wst.sse.core.tests/.cvsignore
deleted file mode 100644
index 7dd370a91..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-ssemodeltests.jar
diff --git a/tests/org.eclipse.wst.sse.core.tests/.project b/tests/org.eclipse.wst.sse.core.tests/.project
deleted file mode 100644
index b073ff4c6..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sse.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.sse.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec575022..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac712..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7adde..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bba7..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 6c7381e49..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.sse.core.tests
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: ssemodeltests.jar
-Bundle-Activator: org.eclipse.wst.sse.core.tests.SSEModelTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.sse.core.tests,
- org.eclipse.wst.sse.core.tests.adaptdom,
- org.eclipse.wst.sse.core.tests.document,
- org.eclipse.wst.sse.core.tests.events,
- org.eclipse.wst.sse.core.tests.examples,
- org.eclipse.wst.sse.core.tests.life,
- org.eclipse.wst.sse.core.tests.threading
-Require-Bundle: org.eclipse.core.resources,
- org.junit,
- org.eclipse.wst.sse.core,
- org.eclipse.core.runtime,
- com.ibm.icu
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.wst.sse.core.tests/about.html b/tests/org.eclipse.wst.sse.core.tests/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.wst.sse.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.sse.core.tests/build.properties b/tests/org.eclipse.wst.sse.core.tests/build.properties
deleted file mode 100644
index 07cd48f15..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/build.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-bin.includes = ssemodeltests.jar,\
-               test.xml,\
-               META-INF/,\
-               about.html
-source.ssemodeltests.jar = src/
-output.ssemodeltests.jar = bin/
diff --git a/tests/org.eclipse.wst.sse.core.tests/plugin.properties b/tests/org.eclipse.wst.sse.core.tests/plugin.properties
deleted file mode 100644
index da827dc57..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.sse.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Tests Plug-in
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/ExistenceTest.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/ExistenceTest.java
deleted file mode 100644
index b19ccdca5..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/ExistenceTest.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.wst.sse.core.tests;
-
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.SSECorePlugin;
-
-
-public class ExistenceTest extends TestCase {
-
-	public void testPluginExists(){
-		assertNotNull(SSECorePlugin.getDefault());
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/Logger.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/Logger.java
deleted file mode 100644
index 0ff321313..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/Logger.java
+++ /dev/null
@@ -1,144 +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.sse.core.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.sse.core.tests"; //$NON-NLS-1$
-	
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * Adds message to log.
-	 * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message text to add to the log
-	 * @param exception exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * @param message text to print
-	 * @param category category of the message, to be compared with /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestSuite.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestSuite.java
deleted file mode 100644
index 843cb4040..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestSuite.java
+++ /dev/null
@@ -1,67 +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.sse.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.sse.core.tests.events.TestAboutToBeChangedEvent;
-import org.eclipse.wst.sse.core.tests.events.TestNewDocumentContentEvent;
-import org.eclipse.wst.sse.core.tests.events.TestNewDocumentEvent;
-import org.eclipse.wst.sse.core.tests.events.TestNoChangeEvent;
-import org.eclipse.wst.sse.core.tests.events.TestRegionChangedEvent;
-import org.eclipse.wst.sse.core.tests.events.TestRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.tests.events.TestStructuredDocumentRegionsReplacedEvent;
-
-
-public class SSEModelTestSuite extends TestSuite {
-
-	/**
-	 * to get picked up by BVT
-	 * 
-	 * @return
-	 */
-	public static Test suite() {
-		return new SSEModelTestSuite();
-	}
-
-	// not ready for threaded tests, yet.
-	// private static Class[] classes = new
-	// Class[]{TestOfThreadLocalImprovement.class,
-	// TestOfThreadLocalWithChanges.class, TestCreation.class};
-
-	// private static Class[] classes = new Class[]{TestCreation.class,
-	// TestDocumentReader.class};
-	// private static Class[] classes = new Class[]{TestCreation.class,
-	// TestDocumentReader.class, TestCharSequenceReader.class,
-	// TestRegionMatches.class};
-
-	private static Class[] classes = new Class[]{ExistenceTest.class, TestNewDocumentContentEvent.class, TestAboutToBeChangedEvent.class, TestNewDocumentEvent.class, TestNoChangeEvent.class, TestRegionChangedEvent.class,TestRegionsReplacedEvent.class,TestStructuredDocumentRegionsReplacedEvent.class};
-
-	public SSEModelTestSuite() {
-		super("SSE Model Basic Test Suite");
-		for (int i = 0; i < classes.length; i++) {
-			addTest(new TestSuite(classes[i], classes[i].getName()));
-		}
-	}
-
-	public SSEModelTestSuite(Class theClass, String name) {
-		super(theClass, name);
-	}
-
-	public SSEModelTestSuite(Class theClass) {
-		super(theClass);
-	}
-
-	public SSEModelTestSuite(String name) {
-		super(name);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestsPlugin.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestsPlugin.java
deleted file mode 100644
index bbd670d4c..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/SSEModelTestsPlugin.java
+++ /dev/null
@@ -1,77 +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.sse.core.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class SSEModelTestsPlugin extends Plugin {
-	//The shared instance.
-	private static SSEModelTestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public SSEModelTestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.sse.core.tests.TestsPluginResources");
-		}
-		catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static SSEModelTestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = SSEModelTestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null ? bundle.getString(key) : key);
-		}
-		catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java
deleted file mode 100644
index ee942f041..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/TestAbstractAdapterFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.wst.sse.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- * 
- * @author pavery
- */
-public class TestAbstractAdapterFactory extends TestCase {
-	
-	private AbstractAdapterFactory fFactory = null;
-	
-	class MyClass implements INodeAdapter {
-		public boolean isAdapterForType(Object type) {
-			return type instanceof MyClass;
-		}
-		public void notifyChanged(INodeNotifier notifier,int eventType,Object changedFeature,Object oldValue,Object newValue,int pos) {
-			// noop
-		}
-	}
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		setUpAdapterFactory();
-	}
-	
-	private void setUpAdapterFactory() {
-		fFactory = new AbstractAdapterFactory(TestAbstractAdapterFactory.MyClass.class, false) {
-			protected INodeAdapter createAdapter(INodeNotifier target) {
-				return new MyClass();
-			}
-		};
-	}
-	
-	public void testAdapt() {
-		fFactory.adapt(null);
-	}
-	
-//	public void testAdaptNew() {
-//		fFactory.adaptNew(null);
-//	}
-	
-//	public void testCopy() {
-//		AdapterFactory f = fFactory.copy();
-//		assertNotNull(f);
-//	}
-	
-	public void testCreate() {
-		// TODO: create unit test
-
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java
deleted file mode 100644
index a8c3993a8..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterFactoryTestOnly.java
+++ /dev/null
@@ -1,118 +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.sse.core.tests.adaptdom;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-
-/**
- * This class exists only to satisfy some of the unit tests.
- * 
- * To test, use following line in client, such as when it intitialized.
- * FactoryRegistry.getFactoryRegistry().addFactory(new
- * AdapterFactoryTestOnly());
- * 
- * Creation date: (11/14/00 7:08:18 PM)
- * 
- * @author: David Williams
- */
-public class AdapterFactoryTestOnly implements INodeAdapterFactory {
-	// This factory deals with three adapters
-	java.util.List adapters = new java.util.ArrayList();
-
-	/**
-	 * CAAdapterFactory constructor.
-	 */
-	public AdapterFactoryTestOnly() {
-		super();
-		adapters.add(new AdapterForDocumentTestOnly());
-		adapters.add(new AdapterForElementTestOnly());
-		adapters.add(new AdapterForAttrTestOnly());
-	}
-
-	/**
-	 * Method that returns the adapter associated with the this factory and
-	 * the given object, and "sets up" the adaptable object to use the
-	 * adapter.
-	 * 
-	 * The adapter may be a singleton or not ... depending on the needs of the
-	 * INodeAdapter ... but in general it is recommended for an adapter to be
-	 * stateless, so the efficiencies of a singleton can be gained.
-	 * 
-	 * The implementation of this method should call addAdapter on the adapted
-	 * object with the correct instance of the adapter.
-	 */
-	public INodeAdapter adapt(INodeNotifier target) {
-		// object.addAdapter(adapterInstance);
-		// return adapterInstance;
-		INodeAdapter result = null;
-
-		Iterator adaptersList = adapters.iterator();
-		while (adaptersList.hasNext()) {
-			INodeAdapter adapter = (INodeAdapter) adaptersList.next();
-			if (adapter.isAdapterForType(target)) {
-				INodeAdapter existingAdapter = target.getExistingAdapter(adapter);
-				if (existingAdapter == null) {
-					target.addAdapter(adapter);
-					result = adapter;
-				}
-			}
-		}
-
-		return result;
-
-	}
-
-	/**
-	 * isFactoryForType method comment.
-	 */
-	public boolean isFactoryForType(java.lang.Object type) {
-		boolean result = false;
-
-		// for now, one adapter for documents, elements, and attr.
-		//
-		if (type instanceof Document) {
-			result = true;
-		}
-		else {
-			if (type instanceof Element) {
-				result = true;
-			}
-			else {
-				if (type instanceof Attr) {
-					result = true;
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	public void release() {
-		// TODO: create unit test
-
-	}
-
-	public INodeAdapterFactory copy() {
-		return new AdapterFactoryTestOnly();
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java
deleted file mode 100644
index e86b84cc0..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForAttrTestOnly.java
+++ /dev/null
@@ -1,48 +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.sse.core.tests.adaptdom;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.w3c.dom.Attr;
-
-
-/**
- * Insert the type's description here. Creation date: (1/9/01 3:37:01 PM)
- * 
- * @author: David Williams
- */
-public class AdapterForAttrTestOnly implements INodeAdapter {
-	/**
-	 * CAAdapterTestOnly constructor comment.
-	 */
-	public AdapterForAttrTestOnly() {
-		super();
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		boolean result = false;
-		if (type instanceof Attr) {
-			result = true;
-		}
-		return result;
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		System.out.println("INodeAdapter AdapterForAttrTestOnly " + this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java
deleted file mode 100644
index f8875c927..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForDocumentTestOnly.java
+++ /dev/null
@@ -1,48 +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.sse.core.tests.adaptdom;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.w3c.dom.Document;
-
-
-/**
- * Insert the type's description here. Creation date: (1/9/01 3:37:01 PM)
- * 
- * @author: David Williams
- */
-public class AdapterForDocumentTestOnly implements INodeAdapter {
-	/**
-	 * CAAdapterTestOnly constructor comment.
-	 */
-	public AdapterForDocumentTestOnly() {
-		super();
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		boolean result = false;
-		if (type instanceof Document) {
-			result = true;
-		}
-		return result;
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		System.out.println("INodeAdapter AdapterForDocumentTestOnly " + this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java
deleted file mode 100644
index 0781564f6..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/adaptdom/AdapterForElementTestOnly.java
+++ /dev/null
@@ -1,48 +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.sse.core.tests.adaptdom;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.w3c.dom.Element;
-
-
-/**
- * Insert the type's description here. Creation date: (1/9/01 3:37:01 PM)
- * 
- * @author: David Williams
- */
-public class AdapterForElementTestOnly implements INodeAdapter {
-	/**
-	 * CAAdapterTestOnly constructor comment.
-	 */
-	public AdapterForElementTestOnly() {
-		super();
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		boolean result = false;
-		if (type instanceof Element) {
-			result = true;
-		}
-		return result;
-	}
-
-	/**
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		System.out.println("INodeAdapter AdapterForElementTestOnly " + this.hashCode() + " has been notified of " + INodeNotifier.EVENT_TYPE_STRINGS[eventType] + " (when " + notifier + " notified it)");
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestCharSequenceReader.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestCharSequenceReader.java
deleted file mode 100644
index 1a585c143..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestCharSequenceReader.java
+++ /dev/null
@@ -1,194 +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.sse.core.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.wst.sse.core.internal.text.CharSequenceReader;
-
-import junit.framework.TestCase;
-
-
-
-public class TestCharSequenceReader extends TestCase {
-
-
-	public TestCharSequenceReader() {
-		super();
-	}
-
-
-	public TestCharSequenceReader(String name) {
-		super(name);
-	}
-
-	String fStandardString = "test123";
-
-	public void testStandardBeginning() {
-		CharSequenceReader reader = new CharSequenceReader(fStandardString, 0, 3);
-		char char1 = (char) reader.read();
-		assertTrue(char1 == 't');
-		char char2 = (char) reader.read();
-		assertTrue(char2 == 'e');
-		char char3 = (char) reader.read();
-		assertTrue(char3 == 's');
-		int eof = reader.read();
-		assertTrue(eof == -1);
-	}
-
-	public void testStandardMiddle() {
-		CharSequenceReader reader = new CharSequenceReader(fStandardString, 2, 3);
-		char char1 = (char) reader.read();
-		assertTrue(char1 == 's');
-		char char2 = (char) reader.read();
-		assertTrue(char2 == 't');
-		char char3 = (char) reader.read();
-		assertTrue(char3 == '1');
-		int eof = reader.read();
-		assertTrue(eof == -1);
-	}
-
-	public void testStandardEnd() {
-		CharSequenceReader reader = new CharSequenceReader(fStandardString, 4, 3);
-		char char1 = (char) reader.read();
-		assertTrue(char1 == '1');
-		char char2 = (char) reader.read();
-		assertTrue(char2 == '2');
-		char char3 = (char) reader.read();
-		assertTrue(char3 == '3');
-		int eof = reader.read();
-		assertTrue(eof == -1);
-	}
-
-	public void testStandardOutOfRange() {
-		CharSequenceReader reader = new CharSequenceReader(fStandardString, 50, 3);
-		int eof = reader.read();
-		assertTrue(eof == -1);
-	}
-
-	public void testStandardPartiallyOutOfRange() {
-		CharSequenceReader reader = new CharSequenceReader(fStandardString, 5, 3);
-		char char1 = (char) reader.read();
-		assertTrue(char1 == '2');
-		char char2 = (char) reader.read();
-		assertTrue(char2 == '3');
-		int eof = reader.read();
-		assertTrue(eof == -1);
-	}
-
-	public void testBufferBegining() throws IOException {
-		CharSequenceReader reader = new CharSequenceReader(fStandardString, 0, 3);
-		String targetString = "tes";
-		
-		// intentionally small sized buffer
-		char[] charbuffer = new char[2];
-		StringBuffer stringBuffer = new StringBuffer();
-		int nRead = 0;
-		while (nRead != -1) {
-			nRead = reader.read(charbuffer);
-			if (nRead > 0) {
-				stringBuffer.append(charbuffer, 0, nRead);
-			}
-		}
-		String testString = stringBuffer.toString();
-		
-		assertEquals(targetString, testString);
-		
-	}
-	public void testBufferEnd() throws IOException {
-		CharSequenceReader reader = new CharSequenceReader(fStandardString, 4, 3);
-		String targetString = "123";
-		
-		// intentionally small sized buffer
-		char[] charbuffer = new char[2];
-		StringBuffer stringBuffer = new StringBuffer();
-		int nRead = 0;
-		while (nRead != -1) {
-			nRead = reader.read(charbuffer);
-			if (nRead > 0) {
-				stringBuffer.append(charbuffer, 0, nRead);
-			}
-		}
-		String testString = stringBuffer.toString();
-		
-		assertEquals(targetString, testString);
-		
-	}	public void testBufferEndEnlarged() throws IOException {
-		CharSequenceReader reader = new CharSequenceReader(fStandardString, 4, 3);
-		String targetString = "123";
-		
-		// intentionally small sized buffer
-		char[] charbuffer = new char[200];
-		StringBuffer stringBuffer = new StringBuffer();
-		int nRead = 0;
-		while (nRead != -1) {
-			nRead = reader.read(charbuffer);
-			if (nRead > 0) {
-				stringBuffer.append(charbuffer, 0, nRead);
-			}
-		}
-		String testString = stringBuffer.toString();
-		
-		assertEquals(targetString, testString);
-		
-	}
-	public void testBufferBeginingEnlarged() throws IOException {
-		CharSequenceReader reader = new CharSequenceReader(fStandardString, 0, 3);
-		String targetString = "tes";
-		
-		// intentionally small sized buffer
-		char[] charbuffer = new char[200];
-		StringBuffer stringBuffer = new StringBuffer();
-		int nRead = 0;
-		while (nRead != -1) {
-			nRead = reader.read(charbuffer);
-			if (nRead > 0) {
-				stringBuffer.append(charbuffer, 0, nRead);
-			}
-		}
-		String testString = stringBuffer.toString();
-		
-		assertEquals(targetString, testString);
-		
-	}
-	public void testBufferBeginingReduced() throws IOException {
-		CharSequenceReader reader = new CharSequenceReader(fStandardString, 0, 3);
-		String targetString = "te";
-		
-		// intentionally small sized buffer
-		char[] charbuffer = new char[2];
-		StringBuffer stringBuffer = new StringBuffer();
-		int nRead = 0;
-		//while (nRead != -1) {
-			nRead = reader.read(charbuffer, 0, 2);
-			if (nRead > 0) {
-				stringBuffer.append(charbuffer, 0, nRead);
-			}
-		//}
-		String testString = stringBuffer.toString();
-		
-		assertEquals(targetString, testString);
-		/// now continue reading same reader
-		targetString = "s";
-		stringBuffer = new StringBuffer();
-		nRead = 0;
-		//while (nRead != -1) {
-			nRead = reader.read(charbuffer, 0, 2);
-			if (nRead > 0) {
-				stringBuffer.append(charbuffer, 0, nRead);
-			}
-		//}
-		testString = stringBuffer.toString();
-		assertEquals(targetString, testString);
-		
-	}
-
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestRegionMatches.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestRegionMatches.java
deleted file mode 100644
index c93d1aa97..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/document/TestRegionMatches.java
+++ /dev/null
@@ -1,93 +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.sse.core.tests.document;
-
-import org.eclipse.wst.sse.core.internal.text.StructuredDocumentTextStore;
-
-import junit.framework.TestCase;
-
-
-
-public class TestRegionMatches extends TestCase {
-
-	/**
-	 *  
-	 */
-	public TestRegionMatches() {
-		super();
-
-	}
-
-	/**
-	 * @param name
-	 */
-	public TestRegionMatches(String name) {
-		super(name);
-
-	}
-
-	public void testRegionMatches1() {
-		StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
-		structuredDocumentTextStore.set("testing123");
-		boolean result = structuredDocumentTextStore.regionMatches(0, 1, "t");
-		assertEquals(true, result);
-	}
-
-	public void testRegionMatches2() {
-		StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
-		structuredDocumentTextStore.set("testing123");
-		boolean result = structuredDocumentTextStore.regionMatches(0, 2, "t");
-		assertEquals(false, result);
-	}
-	public void testRegionMatches3() {
-		StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
-		structuredDocumentTextStore.set("testing123");
-		boolean result = structuredDocumentTextStore.regionMatches(7, 3, "123");
-		assertEquals(true, result);
-	}
-	public void testRegionMatches4() {
-		StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
-		structuredDocumentTextStore.set("testing123");
-		boolean result = structuredDocumentTextStore.regionMatches(8, 3, "234");
-		assertEquals(false, result);
-	}
-	
-	public void testRegionMatchesIgnoreCase() {
-		StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
-		String test = "testing123";
-		String compare = "TeSting123";
-		structuredDocumentTextStore.set(test);
-		boolean result = structuredDocumentTextStore.regionMatches(0, test.length(), compare);
-		assertEquals(false, result);
-		result = structuredDocumentTextStore.regionMatchesIgnoreCase(0, test.length(), compare);
-		assertEquals(true, result);
-	}
-	public void testRegionMatchesIgnoreCase2() {
-		StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
-		String test = "test\u0130ng123";
-		String compare = "TeStIng123";
-		structuredDocumentTextStore.set(test);
-		boolean result = structuredDocumentTextStore.regionMatches(0, test.length(), compare);
-		assertEquals(false, result);
-		result = structuredDocumentTextStore.regionMatchesIgnoreCase(0, test.length(), compare);
-		assertEquals(true, result);
-	}
-	public void testRegionMatchesIgnoreCase3() {
-		StructuredDocumentTextStore structuredDocumentTextStore = new StructuredDocumentTextStore();
-		String test = "testing123";
-		String compare = "TeSt\u0131ng123";
-		structuredDocumentTextStore.set(test);
-		boolean result = structuredDocumentTextStore.regionMatches(0, test.length(), compare);
-		assertEquals(false, result);
-		result = structuredDocumentTextStore.regionMatchesIgnoreCase(0, test.length(), compare);
-		assertEquals(true, result);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/NullParser.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/NullParser.java
deleted file mode 100644
index 46ab20bf5..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/NullParser.java
+++ /dev/null
@@ -1,57 +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.sse.core.tests.events;
-
-import java.io.Reader;
-import java.util.List;
-
-import org.eclipse.wst.sse.core.internal.ltk.parser.RegionParser;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-public class NullParser implements RegionParser {
-
-	public IStructuredDocumentRegion getDocumentRegions() {
-
-		return null;
-	}
-
-	public List getRegions() {
-
-		return null;
-	}
-
-	public RegionParser newInstance() {
-
-		return this;
-	}
-
-	public void reset(Reader reader) {
-		// do nothing
-
-	}
-
-	public void reset(Reader reader, int offset) {
-		// do nothing
-
-	}
-
-	public void reset(String input) {
-		// do nothing
-
-	}
-
-	public void reset(String input, int offset) {
-		// do nothing
-	}
-
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java
deleted file mode 100644
index 79f84da98..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestAboutToBeChangedEvent.java
+++ /dev/null
@@ -1,60 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.provisional.events.AboutToBeChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-public class TestAboutToBeChangedEvent extends TestCase {
-
-	public void testAboutToBeChangedEvent() {
-		AboutToBeChangedEvent event = getBasicEvent();
-		assertNotNull(event);
-	}
-
-	public void testGetDeletedText() {
-		AboutToBeChangedEvent event = getBasicEvent();
-		String d = event.getDeletedText();
-		assertEquals(d, null);
-	}
-
-	public void testGetOriginalRequester() {
-		AboutToBeChangedEvent event = getBasicEvent();
-		Object r = event.getOriginalRequester();
-		assertEquals(this, r);
-	}
-
-	public void testGetStructuredDocument() {
-		AboutToBeChangedEvent event = getBasicEvent();
-		IStructuredDocument d = event.getStructuredDocument();
-		assertNotNull(d);
-	}
-
-	public void testSetDeletedText() {
-		AboutToBeChangedEvent event = getBasicEvent();
-		event.setDeletedText("junkyNothing");
-		// assume ok if no exception
-		assertTrue(true);
-	}
-
-	private AboutToBeChangedEvent getBasicEvent() {
-		IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
-		AboutToBeChangedEvent event = new AboutToBeChangedEvent(document, this, "test", 0, 0);
-		return event;
-
-	}
-
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentContentEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentContentEvent.java
deleted file mode 100644
index ce2637838..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentContentEvent.java
+++ /dev/null
@@ -1,57 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentContentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-public class TestNewDocumentContentEvent extends TestCase {
-	final private static String testString = "testing";
-
-	public void testNewDocumentContentEvent() {
-		NewDocumentContentEvent event = getBasicEvent();
-		assertNotNull(event);
-	}
-
-	public void testGetOffset() {
-		NewDocumentContentEvent event = getBasicEvent();
-		int o = event.getOffset();
-		assertEquals(0, o);
-	}
-
-	public void testGetLength() {
-		NewDocumentContentEvent event = getBasicEvent();
-		int i = event.getLength();
-		assertEquals(testString.length(), i);
-	}
-
-	/*
-	 * Class under test for String getText()
-	 */
-	public void testGetText() {
-		NewDocumentContentEvent event = getBasicEvent();
-		String text = event.getText();
-		assertEquals(testString, text);
-	}
-
-	private NewDocumentContentEvent getBasicEvent() {
-		IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
-		document.setText(this, testString);
-		NewDocumentContentEvent event = new NewDocumentContentEvent(document, this);
-		return event;
-
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentEvent.java
deleted file mode 100644
index 8f8ae731d..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNewDocumentEvent.java
+++ /dev/null
@@ -1,55 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-public class TestNewDocumentEvent extends TestCase {
-	final private static String testString = "testing";
-
-	public void testGetOffset() {
-		NewDocumentEvent event = getBasicEvent();
-		int o = event.getOffset();
-		assertEquals(0, o);
-	}
-
-	public void testGetLength() {
-		NewDocumentEvent event = getBasicEvent();
-		int i = event.getLength();
-		assertEquals(testString.length(), i);
-	}
-
-	public void testNewDocumentEvent() {
-		NewDocumentEvent event = getBasicEvent();
-		assertNotNull(event);
-	}
-
-
-	public void testGetText() {
-		NewDocumentEvent event = getBasicEvent();
-		String text = event.getText();
-		assertEquals(testString, text);
-	}
-
-	private NewDocumentEvent getBasicEvent() {
-		IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
-		document.setText(this, testString);
-		NewDocumentEvent event = new NewDocumentEvent(document, this);
-		return event;
-
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNoChangeEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNoChangeEvent.java
deleted file mode 100644
index 134fc93fc..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestNoChangeEvent.java
+++ /dev/null
@@ -1,38 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-public class TestNoChangeEvent extends TestCase {
-	final private static String testString = "testing";
-
-	public void testNoChangeEvent() {
-		NoChangeEvent event = getBasicEvent();
-		assertNotNull(event);
-		assertEquals(NoChangeEvent.NO_CONTENT_CHANGE, event.reason);
-	}
-
-	private NoChangeEvent getBasicEvent() {
-		IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
-		document.setText(this, testString);
-		NoChangeEvent event = new NoChangeEvent(document, this, "", 0, 0);
-		event.reason = NoChangeEvent.NO_CONTENT_CHANGE;
-		return event;
-	}
-
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionChangedEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionChangedEvent.java
deleted file mode 100644
index e7cb82f92..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionChangedEvent.java
+++ /dev/null
@@ -1,49 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-public class TestRegionChangedEvent extends TestCase {
-	final private static String testString = "testing";
-
-	public void testRegionChangedEvent() {
-		RegionChangedEvent event = getBasicEvent();
-		assertNotNull(event);
-	}
-
-	public void testGetRegion() {
-		RegionChangedEvent event = getBasicEvent();
-		IStructuredDocumentRegion structuredDocumentRegion = event.getStructuredDocumentRegion();
-		assertEquals(null, structuredDocumentRegion);
-	}
-
-	public void testGetStructuredDocumentRegion() {
-		RegionChangedEvent event = getBasicEvent();
-		ITextRegion region = event.getRegion();
-		assertEquals(null, region);
-	}
-
-	private RegionChangedEvent getBasicEvent() {
-		IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
-		document.setText(this, testString);
-		RegionChangedEvent event = new RegionChangedEvent(document, this, null, null, "", 0, 0);
-		return event;
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionsReplacedEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionsReplacedEvent.java
deleted file mode 100644
index b7b116818..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestRegionsReplacedEvent.java
+++ /dev/null
@@ -1,51 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-public class TestRegionsReplacedEvent extends TestCase {
-
-	final private static String testString = "testing";
-
-	public void testRegionsReplacedEvent() {
-		RegionsReplacedEvent event = getBasicEvent();
-		assertNotNull(event);
-	}
-
-	public void testGetNewRegions() {
-		RegionsReplacedEvent event = getBasicEvent();
-		assertNull(event.getNewRegions());
-	}
-
-	public void testGetOldRegions() {
-		RegionsReplacedEvent event = getBasicEvent();
-		assertNull(event.getOldRegions());
-	}
-
-	public void testGetStructuredDocumentRegion() {
-		RegionsReplacedEvent event = getBasicEvent();
-		assertNull(event.getStructuredDocumentRegion());
-	}
-
-	private RegionsReplacedEvent getBasicEvent() {
-		IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
-		document.setText(this, testString);
-		RegionsReplacedEvent event = new RegionsReplacedEvent(document, this, null, null, null, "", 0, 0);
-		return event;
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestStructuredDocumentRegionsReplacedEvent.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestStructuredDocumentRegionsReplacedEvent.java
deleted file mode 100644
index 735b3583c..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/events/TestStructuredDocumentRegionsReplacedEvent.java
+++ /dev/null
@@ -1,45 +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.sse.core.tests.events;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.internal.document.StructuredDocumentFactory;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-public class TestStructuredDocumentRegionsReplacedEvent extends TestCase {
-	final private static String testString = "testing";
-
-	public void testStructuredDocumentRegionsReplacedEvent() {
-		StructuredDocumentRegionsReplacedEvent event = getBasicEvent();
-		assertNotNull(event);
-	}
-
-	public void testGetNewStructuredDocumentRegions() {
-		StructuredDocumentRegionsReplacedEvent event = getBasicEvent();
-		assertNull(event.getNewStructuredDocumentRegions());
-	}
-
-	public void testGetOldStructuredDocumentRegions() {
-		StructuredDocumentRegionsReplacedEvent event = getBasicEvent();
-		assertNull(event.getOldStructuredDocumentRegions());
-	}
-
-	private StructuredDocumentRegionsReplacedEvent getBasicEvent() {
-		IStructuredDocument document = StructuredDocumentFactory.getNewStructuredDocumentInstance(new NullParser());
-		document.setText(this, testString);
-		StructuredDocumentRegionsReplacedEvent event = new StructuredDocumentRegionsReplacedEvent(document, this, null, null, "", 0, 0);
-		return event;
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/examples/TestAtSign.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/examples/TestAtSign.java
deleted file mode 100644
index 9d9100030..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/examples/TestAtSign.java
+++ /dev/null
@@ -1,42 +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.sse.core.tests.examples;
-
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-
-public class TestAtSign {
-
-	public TestAtSign() {
-		super();
-	}
-
-	public static void main(String[] args) throws IOException {
-		Properties properties = new Properties(); //System.getProperties();
-		properties.put("at sign", "this is an \u0040 sign");
-		properties.list(System.out);
-		FileOutputStream outputStream = new FileOutputStream("testAt.txt");
-		properties.store(outputStream, "tests");
-		outputStream.close();
-		InputStream inStream = new FileInputStream("testAt.txt");
-		Properties readProperties = new Properties();
-		readProperties.load(inStream);
-		String atSign = (String) readProperties.get("at sign");
-		System.out.println("at sign from read: " + atSign);
-
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/EmptyModelForTests.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/EmptyModelForTests.java
deleted file mode 100644
index 52b95d8a5..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/EmptyModelForTests.java
+++ /dev/null
@@ -1,31 +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.sse.core.tests.life;
-
-import org.eclipse.wst.sse.core.internal.model.AbstractStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-
-
-
-public class EmptyModelForTests extends AbstractStructuredModel {
-
-	public EmptyModelForTests() {
-
-		super();
-		// TODO Auto-generated constructor stub
-	}
-
-	public IndexedRegion getIndexedRegion(int offset) {
-
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/TestCreation.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/TestCreation.java
deleted file mode 100644
index 18112c5f9..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/life/TestCreation.java
+++ /dev/null
@@ -1,70 +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.sse.core.tests.life;
-
-import org.eclipse.wst.sse.core.internal.model.ModelLifecycleEvent;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-import junit.framework.TestCase;
-
-
-
-
-public class TestCreation extends TestCase {
-	private boolean DEBUG = false;
-
-	public void testCreation() {
-		IStructuredModel structuredModel = new EmptyModelForTests();
-		ModelLifecycleEvent event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_RELEASED);
-		if (DEBUG) {
-			System.out.println(event);
-		}
-		event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_DIRTY_STATE);
-		if (DEBUG) {
-			System.out.println(event);
-		}
-		event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_DOCUMENT_CHANGED);
-		if (DEBUG) {
-			System.out.println(event);
-		}
-		/*        event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_REINITIALIZED);
-		 if (DEBUG) {
-		 System.out.println(event);
-		 }
-		 event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.ADAPTERS_NOTIFIED);
-		 if (DEBUG) {
-		 System.out.println(event);
-		 }
-		 event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_RELOADED);
-		 if (DEBUG) {
-		 System.out.println(event);
-		 }
-		 event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_RESOURCE_DELETED);
-		 if (DEBUG) {
-		 System.out.println(event);
-		 }
-		 event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_RESOURCE_MOVED);
-		 if (DEBUG) {
-		 System.out.println(event);
-		 }
-		 */
-		event = new ModelLifecycleEvent(structuredModel, ModelLifecycleEvent.MODEL_SAVED);
-		if (DEBUG) {
-			System.out.println(event);
-		}
-
-
-		// if gets to here without exception, assume ok.
-		assertTrue(true);
-
-
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java
deleted file mode 100644
index a193ad50d..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalImprovement.java
+++ /dev/null
@@ -1,187 +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.sse.core.tests.threading;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-
-
-/**
- * To print out timings, set DEBUG_TEST to true, other wise, this test passes
- * if no exceptions thrown.
- */
-public class TestOfThreadLocalImprovement extends TestCase {
-	// number of times a pair of tests (with and without) thread local are 
-	// repeated (for more accurate averages).
-	int nTrials = 3;
-	IStructuredDocument fDocument = null;
-	private static final boolean DEBUG_TEST = false;
-	private static final boolean DEBUG_TEST_DETAIL = false;
-	// tests from 1 to MAX_TREADS-1 threads
-	private int MAX_THREADS = 5;
-	private long SLEEP_TIME = 0;
-
-	public TestOfThreadLocalImprovement() throws IOException {
-		super();
-	}
-
-	private final String getContent() {
-		return "<test>" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "</test>";
-	}
-
-	private IStructuredDocument getDocument(String content) throws IOException {
-		if (fDocument == null) {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			fDocument = modelManager.createStructuredDocumentFor("testPerf.xml", content, null);
-		}
-		return fDocument;
-	}
-
-	void linkRunner(final Boolean direction, IStructuredDocument document) {
-		IStructuredDocument structuredDocument = document;
-		IStructuredDocumentRegion previousDocumentRegion = null;
-		long startTime = System.currentTimeMillis();
-		int start = 0;
-		int length = structuredDocument.getLength();
-		int nRegions = 0;
-		for (int i = start; i < length; i++) {
-			int index = i;
-			if (!direction.booleanValue()) {
-				index = (length - 1) - i;
-			}
-			IStructuredDocumentRegion currentDocumentRegion = structuredDocument.getRegionAtCharacterOffset(index);
-			if (currentDocumentRegion != previousDocumentRegion) {
-				nRegions++;
-				previousDocumentRegion = currentDocumentRegion;
-			}
-			Thread.yield();
-			try {
-				Thread.sleep(SLEEP_TIME);
-			}
-			catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-		long endTime = System.currentTimeMillis();
-		if (DEBUG_TEST_DETAIL) {
-			System.out.println("Thread: " + Thread.currentThread() + "   from " + length + " characters, found " + nRegions + " regions in " + (endTime - startTime) + " msecs.");
-		}
-	}
-
-	private long dotestDocumentWalkingWithThreadLocal(int nThreads) throws IOException {
-		BasicStructuredDocument.setUSE_LOCAL_THREAD(true);
-		fDocument = getDocument(getContent());
-		long startTimeOverall = System.currentTimeMillis();
-		doDocumentWalking(nThreads);
-		long endTimeOverall = System.currentTimeMillis();
-		long finalOverall = endTimeOverall - startTimeOverall;
-		if (DEBUG_TEST_DETAIL) {
-			System.out.println("Overall time using Local_Thread: " + finalOverall);
-		}
-		return finalOverall;
-	}
-
-	private long dotestDocumentWalkingWithoutThreadLocal(int nThreads) throws IOException {
-		BasicStructuredDocument.setUSE_LOCAL_THREAD(false);
-		fDocument = getDocument(getContent());
-		long startTimeOverall = System.currentTimeMillis();
-		doDocumentWalking(nThreads);
-		long endTimeOverall = System.currentTimeMillis();
-		long finalOverall = endTimeOverall - startTimeOverall;
-		if (DEBUG_TEST_DETAIL) {
-			System.out.println("Overall time NOT using Local_Thread: " + finalOverall);
-		}
-		return finalOverall;
-	}
-
-	private void doDocumentWalking(int nThreads) throws IOException {
-		Thread[] threads = new Thread[nThreads];
-		boolean toggle = true;
-		for (int i = 0; i < threads.length; i++) {
-			final Boolean direction = new Boolean(toggle);
-			toggle = !toggle;
-			ThreadGroup threadGroup = new ThreadGroup("sse unit tests");
-			Thread thread = new Thread(threadGroup, new Runnable() {
-				public void run() {
-					linkRunner(direction, fDocument);
-				}
-			}, ("sse unit test thread " + i));
-			// I used MIN_PRIORITY since that makes it easier to "see" in debugger list of threads
-			thread.setPriority(Thread.MIN_PRIORITY);
-			threads[i] = thread;
-		}
-		for (int i = 0; i < threads.length; i++) {
-			threads[i].start();
-		}
-		try {
-			for (int i = 0; i < threads.length; i++) {
-				threads[i].join();
-
-			}
-		}
-		catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	public void testNThreads() throws IOException {
-		for (int i = 1; i < MAX_THREADS; i++) {
-			int nThreads = i;
-			if (DEBUG_TEST_DETAIL) {
-				System.out.println(" >>>>---- N Threads: " + i);
-			}
-			float woCumm = 0;
-			float wCumm = 0;
-
-			for (int j = 0; j < nTrials; j++) {
-				woCumm = woCumm + dotestDocumentWalkingWithoutThreadLocal(nThreads);
-				wCumm = wCumm + dotestDocumentWalkingWithThreadLocal(nThreads);
-			}
-			float averageWO = woCumm / nTrials;
-			float averageW = wCumm / nTrials;
-			float perThreadWO = averageWO / nThreads;
-			float perThreadW = averageW / nThreads;
-			int roundedWO = new Float(perThreadWO).intValue();
-			int roundedW = new Float(perThreadW).intValue();
-			if (DEBUG_TEST) {
-				System.out.println("Average per thread: without: " + roundedWO + " with: " + roundedW);
-				System.out.println(" <<<<<---- N Threads: " + i);
-			}
-		}
-		// if gets to here (with no exceptions) all is ok.
-		assertTrue(0 == 0);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java
deleted file mode 100644
index 23c643dc7..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/TestOfThreadLocalWithChanges.java
+++ /dev/null
@@ -1,191 +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.sse.core.tests.threading;
-
-import java.io.IOException;
-import java.util.Random;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-
-
-/**
- * This class started off as copy of TestOfThreadLocalImprovements, and I just
- * added another thread with modifies the document.
- */
-public class TestOfThreadLocalWithChanges extends TestCase {
-	// number of times a pair of tests (with and without) thread local are
-	// repeated (for more accurate averages).
-	int nTrials = 3;
-	IStructuredDocument fDocument = null;
-	private static final boolean DEBUG_TEST_DETAIL = false;
-	// tests from 1 to MAX_TREADS-1 threads
-	private int MAX_THREADS = 14;
-	private long SLEEP_TIME = 2;
-	private int N_CHANGES = 10000;
-
-	public TestOfThreadLocalWithChanges() throws IOException {
-		super();
-	}
-
-	private final String getContent() {
-		return "<test>" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)"
-					+ "<extra> <junk> to make a <large/> file (over <1000> chars)" + "<extra> <junk> to make a <large/> file (over <1000> chars)" + "</test>";
-	}
-
-	private IStructuredDocument getDocument(String content) throws IOException {
-		if (fDocument == null) {
-			IModelManager modelManager = StructuredModelManager.getModelManager();
-			fDocument = modelManager.createStructuredDocumentFor("testPerf.xml", content, null);
-		}
-		return fDocument;
-	}
-
-	void linkRunner(final Boolean direction, IStructuredDocument document) {
-		IStructuredDocument structuredDocument = document;
-		IStructuredDocumentRegion previousDocumentRegion = null;
-		long startTime = System.currentTimeMillis();
-		int start = 0;
-		int length = structuredDocument.getLength();
-		int nRegions = 0;
-		// I made length "dynamic" after adding modification thread
-		for (int i = start; i < structuredDocument.getLength(); i++) {
-			int index = i;
-			if (!direction.booleanValue()) {
-				int currentLength = structuredDocument.getLength();
-				index = (currentLength - 1) - i;
-			}
-			IStructuredDocumentRegion currentDocumentRegion = structuredDocument.getRegionAtCharacterOffset(index);
-			if (currentDocumentRegion != previousDocumentRegion) {
-				nRegions++;
-				previousDocumentRegion = currentDocumentRegion;
-			}
-			Thread.yield();
-			try {
-				Thread.sleep(SLEEP_TIME);
-			}
-			catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-		long endTime = System.currentTimeMillis();
-		if (DEBUG_TEST_DETAIL) {
-			System.out.println("Thread: " + Thread.currentThread() + "   from " + length + " characters, found " + nRegions + " regions in " + (endTime - startTime) + " msecs.");
-		}
-	}
-
-	private long dotestDocumentWalkingWithThreadLocal(int nThreads) throws IOException {
-		BasicStructuredDocument.setUSE_LOCAL_THREAD(true);
-		fDocument = getDocument(getContent());
-		long startTimeOverall = System.currentTimeMillis();
-		doDocumentWalking(nThreads);
-		long endTimeOverall = System.currentTimeMillis();
-		long finalOverall = endTimeOverall - startTimeOverall;
-		if (DEBUG_TEST_DETAIL) {
-			System.out.println("Overall time using Local_Thread: " + finalOverall);
-		}
-		return finalOverall;
-	}
-
-	private void doDocumentWalking(int nThreads) throws IOException {
-		Thread[] threads = new Thread[nThreads];
-		boolean toggle = true;
-		for (int i = 0; i < threads.length; i++) {
-			final Boolean direction = new Boolean(toggle);
-			// toggle controls whether moves from start to end, or end to start
-			// of document.
-			toggle = !toggle;
-			ThreadGroup threadGroup = new ThreadGroup("unit tests");
-			Thread thread = new Thread(threadGroup, new Runnable() {
-				public void run() {
-					linkRunner(direction, fDocument);
-				}
-			}, ("sse unit test thread " + i));
-			// I used MIN_PRIORITY since that makes it easier to "see" in
-			// debugger list of threads
-			thread.setPriority(Thread.MIN_PRIORITY);
-			threads[i] = thread;
-		}
-		for (int i = 0; i < threads.length; i++) {
-			threads[i].start();
-		}
-		// now that "readers" have started, we'll start a modification thread
-		// too
-		Thread modifyingThread = new Thread(new Runnable() {
-			public void run() {
-				modifiyDocument(fDocument);
-			}
-		}, ("sse unit test modification thread "));
-		// I used MAX_PRIORITY to be sure lots of modifications take place
-		modifyingThread.setPriority(Thread.MIN_PRIORITY);
-		modifyingThread.start();
-		try {
-			for (int i = 0; i < threads.length; i++) {
-				threads[i].join();
-			}
-			modifyingThread.join();
-		}
-		catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-
-	void modifiyDocument(IStructuredDocument document) {
-		Random random = new Random();
-		for (int i = 0; i < N_CHANGES + 1; i++) {
-			int randomOffset = random.nextInt(document.getLength());
-			// 100 just seems like a good maximum length to replace
-			// (could play with in future).
-			int randomLength = random.nextInt(100);
-			// if we "accidently" get more than the length, just skipit
-			if (randomOffset + randomLength < document.getLength()) {
-				document.replaceText(this, randomOffset, randomLength, "testingtext");
-			}
-		}
-	}
-
-	public void testNThreads() throws IOException {
-		for (int i = 1; i < MAX_THREADS; i++) {
-			int nThreads = i;
-			if (DEBUG_TEST_DETAIL) {
-				System.out.println(" >>>>---- N Threads: " + i);
-			}
-			float wCumm = 0;
-			for (int j = 0; j < nTrials; j++) {
-				wCumm = wCumm + dotestDocumentWalkingWithThreadLocal(nThreads);
-			}
-		}
-		// if gets to here (with no exceptions) all is ok.
-		assertTrue(0 == 0);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalExample.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalExample.java
deleted file mode 100644
index 747d01f87..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalExample.java
+++ /dev/null
@@ -1,86 +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.sse.core.tests.threading;
-
-import java.util.Random;
-
-/**
- * See http://java.sun.com/developer/JDCTechTips/2003/tt1208.html#2 for
- * informative article.
- */
-public class ThreadLocalExample {
-
-	// Create thread local class
-	// Initial value is a random number from 0-999
-	private static class MyThreadLocal extends ThreadLocal {
-		private Random innerRandom = new Random();
-
-		protected Object initialValue() {
-			return new Integer(innerRandom.nextInt(1000));
-		}
-	}
-
-	// Create class variable
-	static volatile int counter = 0;
-
-	// Define/create thread local variable
-	static ThreadLocal threadLocal = new MyThreadLocal();
-
-	// For random number generation
-	// static Random random = new Random();
-
-	// Displays thread local variable, counter,
-	// and thread name
-	static void displayValues() {
-		System.out.println(threadLocal.get() + "\t" + counter + "\t" + Thread.currentThread().getName());
-	}
-
-	public static void main(String args[]) {
-
-		// Each thread increments counter
-		// Displays variable info
-		// And sleeps for the random amount of time
-		// Before displaying info again
-		Runnable runner = new Runnable() {
-			public void run() {
-				synchronized (ThreadLocalExample.class) {
-					counter++;
-				}
-				displayValues();
-				try {
-					Thread.sleep(((Integer) threadLocal.get()).intValue());
-					displayValues();
-				}
-				catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-			}
-		};
-
-		// Another instance of class created
-		// and values displayed
-		displayValues();
-
-		// Here's where the other threads
-		// are actually created
-		for (int i = 0; i < 5; i++) {
-			Thread t = new Thread(runner);
-			t.start();
-		}
-	}
-
-	/**
-	 *  
-	 */
-	public ThreadLocalExample() {
-		super();
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalInstanceExample.java b/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalInstanceExample.java
deleted file mode 100644
index 5d08f5940..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/src/org/eclipse/wst/sse/core/tests/threading/ThreadLocalInstanceExample.java
+++ /dev/null
@@ -1,90 +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.sse.core.tests.threading;
-
-import java.util.Random;
-
-/**
- * See http://java.sun.com/developer/JDCTechTips/2003/tt1208.html#2 for
- * informative article.
- */
-public class ThreadLocalInstanceExample {
-
-	// Create thread local class
-	// Initial value is a random number from 0-999
-	private class MyThreadLocal extends ThreadLocal {
-		private Random innerRandom = new Random();
-
-		protected Object initialValue() {
-			return new Integer(innerRandom.nextInt(1000));
-		}
-	}
-
-	// Create class variable
-	static volatile int counter = 0;
-
-	// Define/create thread local variable
-	ThreadLocal threadLocal = new MyThreadLocal();
-
-	// For random number generation
-	// static Random random = new Random();
-
-	// Displays thread local variable, counter,
-	// and thread name
-	void displayValues() {
-		System.out.println(threadLocal.get() + "\t" + counter + "\t" + Thread.currentThread().getName());
-	}
-
-	public static void main(String args[]) {
-		new ThreadLocalInstanceExample().startRun();
-	}
-
-	private void startRun() {
-
-		// Each thread increments counter
-		// Displays variable info
-		// And sleeps for the random amount of time
-		// Before displaying info again
-		Runnable runner = new Runnable() {
-			public void run() {
-				synchronized (this) {
-					counter++;
-				}
-				displayValues();
-				try {
-					Thread.sleep(((Integer) threadLocal.get()).intValue());
-					displayValues();
-				}
-				catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-			}
-		};
-
-		// Another instance of class created
-		// and values displayed
-		displayValues();
-
-		// Here's where the other threads
-		// are actually created
-		for (int i = 0; i < 5; i++) {
-			Thread t = new Thread(runner);
-			t.start();
-		}
-	}
-
-	/**
-	 *  
-	 */
-	public ThreadLocalInstanceExample() {
-		super();
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.core.tests/test.xml b/tests/org.eclipse.wst.sse.core.tests/test.xml
deleted file mode 100644
index b8e3cbe6b..000000000
--- a/tests/org.eclipse.wst.sse.core.tests/test.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-    <property
-        name="plugin-name"
-        value="org.eclipse.wst.sse.core.tests" />
-    <property
-        name="classname"
-        value="org.eclipse.wst.sse.core.tests.SSEModelTestSuite" />
-    <property
-        name="testType"
-        value="core-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.classpath b/tests/org.eclipse.wst.sse.ui.tests/.classpath
deleted file mode 100644
index a99584684..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.cvsignore b/tests/org.eclipse.wst.sse.ui.tests/.cvsignore
deleted file mode 100644
index f72a1d897..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-sseeditortests.jar
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.project b/tests/org.eclipse.wst.sse.ui.tests/.project
deleted file mode 100644
index 0b072b983..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sse.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.sse.ui.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec575022..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac712..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7adde..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bba7..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 3aadc7705..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.sse.ui.tests; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: sseeditortests.jar
-Bundle-Activator: org.eclipse.wst.sse.ui.tests.SSETestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.sse.ui.tests,
- org.eclipse.wst.sse.ui.tests.viewer
-Require-Bundle: org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.sse.core,
- org.junit,
- org.eclipse.core.resources,
- org.eclipse.ui.workbench.texteditor,
- org.eclipse.ui.editors,
- org.eclipse.jface.text,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.modulecore,
- com.ibm.icu
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.wst.sse.ui.tests/about.html b/tests/org.eclipse.wst.sse.ui.tests/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.wst.sse.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.sse.ui.tests/build.properties b/tests/org.eclipse.wst.sse.ui.tests/build.properties
deleted file mode 100644
index 5a7f41d20..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/build.properties
+++ /dev/null
@@ -1,17 +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
-###############################################################################
-source.sseeditortests.jar = src/
-output.sseeditortests.jar = bin/
-bin.includes = plugin.xml,\
-               sseeditortests.jar,\
-               test.xml,\
-               META-INF/,\
-               about.html
diff --git a/tests/org.eclipse.wst.sse.ui.tests/icons/sourceEditor.gif b/tests/org.eclipse.wst.sse.ui.tests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb858..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/icons/sourceEditor.gif
+++ /dev/null
diff --git a/tests/org.eclipse.wst.sse.ui.tests/plugin.properties b/tests/org.eclipse.wst.sse.ui.tests/plugin.properties
deleted file mode 100644
index 9f4e1fbc2..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/plugin.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# properties file for org.eclipse.wst.sse.ui.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Structured Source Editor Tests
-editor.name.0 = Generic Structured Text Editor
-category.name.0 = SSE Testing
-view.name.0 = ExtendedStorageEditorInput Management Tester
-view.name.1 = Action Tester
-action.label.0 = org.eclipse.ui.popupMenus Test Action
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.ui.tests/plugin.xml b/tests/org.eclipse.wst.sse.ui.tests/plugin.xml
deleted file mode 100644
index 7e00f8148..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/plugin.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.ui.editors">
-		<editor
-			name="%editor.name.0"
-			extensions="project, classpath, websettings, serverPreference"
-			icon="$nl$/icons/sourceEditor.gif"
-			class="org.eclipse.wst.sse.ui.StructuredTextEditor"
-			contributorClass="org.eclipse.wst.sse.ui.internal.actions.ActionContributor"
-			id="org.eclipse.wst.sse.ui.StructuredTextEditor.test">
-		</editor>
-	</extension>
-	
-	<!-- Editor actionsets -->
-	<extension point="org.eclipse.ui.actionSetPartAssociations">
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
-			<part
-				id="org.eclipse.wst.sse.ui.StructuredTextEditor.test">
-			</part>
-		</actionSetPartAssociation>
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.NavigateActionSet">
-			<part
-				id="org.eclipse.wst.sse.ui.StructuredTextEditor.test">
-			</part>
-		</actionSetPartAssociation>
-	</extension>
-
-	<extension point="org.eclipse.ui.views">
-		<category
-			name="%category.name.0"
-			id="org.eclipse.wst.sse.ui.tests">
-		</category>
-		<view
-			name="%view.name.0"
-			category="org.eclipse.wst.sse.ui.tests"
-			class="org.eclipse.wst.sse.ui.tests.ExtendedStorageEditorInputView"
-			id="org.eclipse.wst.sse.ui.tests.ExtendedStorageEditorInputView">
-		</view>
-		<view
-			name="%view.name.1"
-			category="org.eclipse.wst.sse.ui.tests"
-			class="org.eclipse.wst.sse.ui.tests.ActionTestView"
-			id="org.eclipse.wst.sse.ui.tests.ActionTestView">
-		</view>
-	</extension>
-
-	<extension point="org.eclipse.ui.popupMenus">
-		<viewerContribution
-			targetID="org.eclipse.wst.sse.ui.StructuredTextEditor.EditorContext"
-			id="org.eclipse.wst.sse.ui.tests.test">
-			<action
-				label="%action.label.0"
-				class="org.eclipse.wst.sse.ui.tests.TestActionDelegate"
-				menubarPath="additions"
-				id="org.eclipse.wst.sse.ui.tests.test.1" />
-		</viewerContribution>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
-		<provisionalConfiguration
-			type="linestyleprovider"
-			class="org.eclipse.wst.sse.ui.tests.TestLineStyleProvider"
-			target="org.eclipse.wst.html.SCRIPT.language.BLUE" />
-		<provisionalConfiguration
-			type="linestyleprovider"
-			class="org.eclipse.wst.sse.ui.tests.TestLineStyleProvider"
-			target="org.eclipse.wst.html.SCRIPT.type.TEXT/BLUE" />
-		<provisionalConfiguration
-			type="linestyleprovider"
-			class="org.eclipse.wst.sse.ui.tests.TestLineStyleProvider"
-			target="org.eclipse.jst.jsp.SCRIPT.BLUE" />
-	</extension>
-	
-</plugin>
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ActionTestView.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ActionTestView.java
deleted file mode 100644
index 1c8c7f796..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ActionTestView.java
+++ /dev/null
@@ -1,172 +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.sse.ui.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.TextViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-
-/**
- * @author nitin
- * 
- * A view to hang actions off of to execute arbitrary code at arbitrary times.
- */
-public class ActionTestView extends ViewPart {
-
-	private class ComponentViewer extends Action {
-		public void run() {
-			super.run();
-			if (fSelection != null && !fSelection.isEmpty() && fSelection instanceof IStructuredSelection) {
-				IStructuredSelection selection = (IStructuredSelection) fSelection;
-				if (selection.getFirstElement() instanceof IResource) {
-					IResource resource = (IResource) selection.getFirstElement();
-					IVirtualResource[] virtualResources = ComponentCore.createResources(resource.getProject());
-					// Only return results for Flexible projects
-					if (virtualResources != null) {
-						for (int i = 0; i < virtualResources.length; i++) {
-							System.out.println(virtualResources[i].getComponent().getRootFolder().getWorkspaceRelativePath());
-						}
-					}
-				}
-			}
-		}
-	}
-
-	class EmptyTextSetter extends Action {
-		public EmptyTextSetter() {
-			super("Set Text Editor text to empty");
-			setToolTipText("Set Text Editor text to empty using set() API");
-		}
-
-		public void run() {
-			super.run();
-			IEditorPart editor = getViewSite().getPage().getActiveEditor();
-			ITextEditor textEditor = null;
-			if (editor instanceof ITextEditor)
-				textEditor = (ITextEditor) editor;
-			else
-				textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
-			if (textEditor != null) {
-				IDocument document = textEditor.getDocumentProvider().getDocument(editor.getEditorInput());
-				document.set("");
-			}
-			else {
-				print("Error getting IDocument.\n");
-			}
-		}
-	}
-
-	Control fControl = null;
-
-	ISelection fSelection;
-	private ISelectionListener fSelectionListener;
-
-	private List createActions() {
-		List actions = new ArrayList();
-
-		actions.add(new EmptyTextSetter());
-		actions.add(new ComponentViewer());
-		return actions;
-	}
-
-	/**
-	 * @return
-	 */
-	private List createContribututions() {
-		List actions = new ArrayList();
-		return actions;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		ITextViewer text = new TextViewer(parent, SWT.READ_ONLY);
-		text.setDocument(new Document());
-		fControl = text.getTextWidget();
-		text.getDocument().set("Use either the toolbar or the menu to run your actions\n\n");
-	}
-
-	private ISelectionListener getSelectionListener() {
-		if (fSelectionListener == null) {
-			fSelectionListener = new ISelectionListener() {
-				public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-					fSelection = selection;
-				}
-			};
-		}
-		return fSelectionListener;
-	}
-
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite)
-	 */
-	public void init(IViewSite site) throws PartInitException {
-		super.init(site);
-		List actions = createActions();
-		for (int i = 0; i < actions.size(); i++) {
-			site.getActionBars().getToolBarManager().add((IAction) actions.get(i));
-			site.getActionBars().getMenuManager().add((IAction) actions.get(i));
-		}
-		List contributions = createContribututions();
-		for (int i = 0; i < contributions.size(); i++) {
-			site.getActionBars().getToolBarManager().add((IContributionItem) contributions.get(i));
-			site.getActionBars().getMenuManager().add((IContributionItem) contributions.get(i));
-		}
-		site.getWorkbenchWindow().getSelectionService().addPostSelectionListener(getSelectionListener());
-	}
-
-	void print(String s) {
-		((StyledText) fControl).append(s);
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		if (fControl != null && !fControl.isDisposed()) {
-			fControl.setFocus();
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/CommonEditorPreferencesTest.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/CommonEditorPreferencesTest.java
deleted file mode 100644
index a442c0deb..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/CommonEditorPreferencesTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.sse.ui.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.preferences.CommonEditorPreferenceNames;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-
-/**
- * The purpose of this test is to verify the validity of the
- * StructuredTextEditor's common editor preferences. Tests include
- * setting/getting preferences.
- * 
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class CommonEditorPreferencesTest extends TestCase {
-	/**
-	 * Tests existance of preference values when getting preference values
-	 * through Platform.getPreferencesService()
-	 */
-	public void testBundleGetPreferences() {
-		final String bundleName = "org.eclipse.wst.sse.ui";
-
-		// need to start up bundle for default values to be loaded
-		Bundle bundle = Platform.getBundle(bundleName);
-		try {
-			if (bundle != null)
-				bundle.start();
-			else
-				fail("Get preference value failed because could not find bundle: " + bundleName);
-		} catch (BundleException e) {
-			fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
-		}
-
-		bundleGetPreference(bundleName, CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS);
-	}
-	
-	private void bundleGetPreference(String bundleName, String prefKey) {
-		String defaultValue = Long.toString(System.currentTimeMillis());	// random string
-		
-		String value = Platform.getPreferencesService().getString(bundleName, prefKey, defaultValue, null);
-		assertNotSame("Get preference value failed using Platform.getPreferencesService. Key: "+prefKey, defaultValue, value);		
-	}
-
-	/**
-	 * Tests default values of preferences.
-	 * 
-	 * NOTE: Expected default values are hard-coded, so if default values do
-	 * get changed, assertions need to be updated as well
-	 */
-	public void testPluginGetDefaultPreferences() {
-		IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore();
-		
-		pluginGetDefaultPreference(store, CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS, Boolean.toString(true));
-	}
-	
-	private void pluginGetDefaultPreference(IPreferenceStore store, String prefKey, String expected) {
-		String defaultValue = store.getDefaultString(prefKey);
-		assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: "+prefKey, expected, defaultValue);
-	}
-
-	/**
-	 * Tests setting preference values by setting preference value to be a
-	 * certain value, then getting the preference value to verify it was set.
-	 */
-	public void testPluginSetPreferences() {
-		IPreferenceStore store = SSEUIPlugin.getDefault().getPreferenceStore();
-		
-		pluginSetPreferenceBoolean(store, CommonEditorPreferenceNames.EVALUATE_TEMPORARY_PROBLEMS);
-	}
-	
-	private void pluginSetPreferenceBoolean(IPreferenceStore store, String prefKey) {
-		boolean originalValue = store.getBoolean(prefKey);
-		boolean expectedValue = !originalValue;
-		store.setValue(prefKey, expectedValue);
-		boolean foundValue = store.getBoolean(prefKey);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: "+prefKey+"  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		store.setValue(prefKey, originalValue);
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java
deleted file mode 100644
index f0d320e76..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/ExtendedStorageEditorInputView.java
+++ /dev/null
@@ -1,820 +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.sse.ui.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IReusableEditor;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ResourceSelectionDialog;
-import org.eclipse.ui.editors.text.EditorsUI;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.texteditor.IElementStateListener;
-import org.eclipse.ui.texteditor.IUpdate;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.IExtendedStorageEditorInput;
-
-
-/**
- * @author nitin
- * 
- * A view to assist in testing out StructuredTextEditor's IEditorInput
- * handling.
- * 
- * Permanently in-progress.
- */
-public class ExtendedStorageEditorInputView extends ViewPart {
-	/**
-	 * Adds an IFileEditorInput to the list of inputs with which to test
-	 */
-	class AddFileInputAction extends Action {
-		public AddFileInputAction() {
-			super("Add FileEditorInput");
-		}
-
-		public void run() {
-			super.run();
-			ResourceSelectionDialog dlg = new ResourceSelectionDialog(fInputList.getControl().getShell(), ResourcesPlugin.getWorkspace().getRoot(), "Choose");
-			int retval = dlg.open();
-			if (retval == Window.OK) {
-				Object[] files = dlg.getResult();
-				for (int i = 0; i < files.length; i++) {
-					fInputs.add(new FileEditorInput((IFile) files[i]));
-				}
-				fInputList.refresh(true);
-			}
-		}
-	}
-
-	/**
-	 * Adds an IStorageEditorInput to the list of inputs with which to test
-	 */
-	class AddStorageInputAction extends Action {
-		public AddStorageInputAction() {
-			super("Add StorageEditorInput");
-		}
-
-		public void run() {
-			super.run();
-			FileDialog dlg = new FileDialog(fInputList.getControl().getShell());
-			String fileName = dlg.open();
-			if (fileName != null) {
-				fInputs.add(new FileBasedStorageEditorInput(new File(fileName)));
-				fInputList.refresh(true);
-			}
-		}
-	}
-
-	/**
-	 * Handler for double-click 
-	 */
-	class DoubleClickListener implements IDoubleClickListener {
-		public void doubleClick(DoubleClickEvent event) {
-			new InputOpenAction().run();
-		}
-	}
-
-	class EditorInputLabelProvider implements ITableLabelProvider {
-		ILabelProvider baseProvider = new WorkbenchLabelProvider();
-
-		public void addListener(ILabelProviderListener listener) {
-			// not implemented
-		}
-
-		public void dispose() {
-			// no need
-		}
-
-		public Image getColumnImage(Object element, int columnIndex) {
-			if (element instanceof IFileEditorInput && columnIndex == 0) {
-				return baseProvider.getImage(((IFileEditorInput) element).getFile());
-			}
-			return null;
-		}
-
-		public String getColumnText(Object element, int columnIndex) {
-			IEditorInput input = (IEditorInput) element;
-			String text = null;
-			switch (columnIndex) {
-				case 0 :
-					try {
-						if (element instanceof FileBasedStorageEditorInput) {
-							IPath fullpath = ((FileBasedStorageEditorInput) element).getStorage().getFullPath();
-							text = fullpath != null ? fullpath.toString() : ((FileBasedStorageEditorInput) element).getName();
-							if (((FileBasedStorageEditorInput) element).isDirty()) {
-								text = "*" + text;
-							}
-						}
-						else if (element instanceof IFileEditorInput) {
-							text = ((IFileEditorInput) element).getFile().getFullPath().toString();
-						}
-					}
-					catch (CoreException e) {
-						e.printStackTrace();
-					}
-
-					break;
-				case 1 :
-					if (element instanceof FileBasedStorageEditorInput) {
-						text = "FileBasedStorageEditorInput";
-					}
-					else if (element instanceof IFileEditorInput) {
-						text = "FileEditorInput";
-					}
-					else {
-						text = input.getClass().getName();
-					}
-					break;
-			}
-			if (text == null)
-				text = "";
-			return text;
-		}
-
-		public boolean isLabelProperty(Object element, String property) {
-			return false;
-		}
-
-		public void removeListener(ILabelProviderListener listener) {
-			// not implemented
-		}
-	}
-
-
-	class FileBackedStorage implements IStorage {
-		File fFile = null;
-
-		FileBackedStorage(File file) {
-			super();
-			fFile = file;
-		}
-
-		boolean exists() {
-			return fFile.exists();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-		 */
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IStorage#getContents()
-		 */
-		public InputStream getContents() throws CoreException {
-			InputStream contents = null;
-			try {
-				contents = new FileInputStream(fFile);
-				ByteBuffer buffer = ByteBuffer.allocate((int) fFile.length());
-				byte[] bytes = new byte[2048];
-				while (contents.available() > 0) {
-					int count = contents.read(bytes);
-					buffer.put(bytes, 0, count);
-				}
-				contents.close();
-
-				contents = new ByteArrayInputStream(buffer.array());
-			}
-			catch (FileNotFoundException e) {
-				contents = new ByteArrayInputStream(new byte[0]);
-			}
-			catch (IOException e) {
-				contents = new ByteArrayInputStream(new byte[0]);
-			}
-			return contents;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IStorage#getFullPath()
-		 */
-		public IPath getFullPath() {
-			if (provideIStorageFullPath) {
-				return new Path(fFile.getAbsolutePath());
-			}
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IStorage#getName()
-		 */
-		public String getName() {
-			return fFile.getName();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.resources.IStorage#isReadOnly()
-		 */
-		public boolean isReadOnly() {
-			return true;
-		}
-	}
-
-	class FileBasedStorageEditorInput implements IExtendedStorageEditorInput {
-		List fElementStateListeners = new Vector(0);
-		boolean fIsDirty = false;
-		FileBackedStorage fStorage = null;
-
-		FileBasedStorageEditorInput(File file) {
-			fStorage = new FileBackedStorage(file);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.ui.extensions.breakpoint.IExtendedStorageEditorInput#addElementStateListener(org.eclipse.ui.texteditor.IElementStateListener)
-		 */
-		public void addElementStateListener(IElementStateListener listener) {
-			fElementStateListeners.add(listener);
-		}
-
-		void elementContentAboutToBeReplaced() {
-			for (int i = 0; i < fElementStateListeners.size(); i++) {
-				((IElementStateListener) fElementStateListeners.get(i)).elementContentAboutToBeReplaced(FileBasedStorageEditorInput.this);
-			}
-		}
-
-		void elementContentReplaced() {
-			for (int i = 0; i < fElementStateListeners.size(); i++) {
-				((IElementStateListener) fElementStateListeners.get(i)).elementContentReplaced(FileBasedStorageEditorInput.this);
-			}
-		}
-
-		void elementDeleted() {
-			for (int i = 0; i < fElementStateListeners.size(); i++) {
-				((IElementStateListener) fElementStateListeners.get(i)).elementDeleted(FileBasedStorageEditorInput.this);
-			}
-		}
-
-		void elementDirtyStateChanged(boolean dirty) {
-			setDirty(dirty);
-			for (int i = 0; i < fElementStateListeners.size(); i++) {
-				((IElementStateListener) fElementStateListeners.get(i)).elementDirtyStateChanged(FileBasedStorageEditorInput.this, dirty);
-			}
-		}
-
-		void elementMoved(Object oldElement, Object newElement) {
-			for (int i = 0; i < fElementStateListeners.size(); i++) {
-				((IElementStateListener) fElementStateListeners.get(i)).elementMoved(FileBasedStorageEditorInput.this, FileBasedStorageEditorInput.this);
-			}
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.ui.IEditorInput#exists()
-		 */
-		public boolean exists() {
-			return fStorage.exists();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-		 */
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-
-		File getFile() {
-			return fStorage.fFile;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-		 */
-		public ImageDescriptor getImageDescriptor() {
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.ui.IEditorInput#getName()
-		 */
-		public String getName() {
-			return fStorage.getName();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.ui.IEditorInput#getPersistable()
-		 */
-		public IPersistableElement getPersistable() {
-			return null;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.ui.IStorageEditorInput#getStorage()
-		 */
-		public IStorage getStorage() throws CoreException {
-			return fStorage;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-		 */
-		public String getToolTipText() {
-			return fStorage.getFullPath() != null ? fStorage.getFullPath().toString() : fStorage.getName();
-		}
-
-		boolean isDirty() {
-			return fIsDirty;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.ui.extensions.breakpoint.IExtendedStorageEditorInput#removeElementStateListener(org.eclipse.ui.texteditor.IElementStateListener)
-		 */
-		public void removeElementStateListener(IElementStateListener listener) {
-			fElementStateListeners.remove(listener);
-		}
-
-		void setDirty(boolean dirty) {
-			fIsDirty = dirty;
-		}
-	}
-
-	class InputChangeDirtyStateAction extends Action implements IUpdate {
-		public InputChangeDirtyStateAction() {
-			super("Toggle dirty flag");
-		}
-
-		public void run() {
-			super.run();
-			IEditorInput[] inputs = getSelectedInputs();
-			for (int i = 0; i < inputs.length; i++) {
-				if (inputs[i] instanceof FileBasedStorageEditorInput) {
-					((FileBasedStorageEditorInput) inputs[i]).elementDirtyStateChanged(!((FileBasedStorageEditorInput) inputs[i]).isDirty());
-				}
-			}
-			fInputList.refresh(true);
-		}
-
-		public void update() {
-			setEnabled(fSelectedElement != null && fSelectedElement instanceof FileBasedStorageEditorInput);
-		}
-	}
-
-	class InputDeleteAction extends Action implements IUpdate {
-		public InputDeleteAction() {
-			super("Delete Input");
-		}
-
-		public void run() {
-			super.run();
-			IEditorInput[] inputs = getSelectedInputs();
-			for (int i = 0; i < inputs.length; i++) {
-				if (inputs[i] instanceof FileBasedStorageEditorInput) {
-					((FileBasedStorageEditorInput) inputs[i]).elementDeleted();
-				}
-			}
-			for (int i = 0; i < inputs.length; i++) {
-				fInputs.remove(inputs[i]);
-			}
-			fInputList.refresh();
-		}
-
-		public void update() {
-			setEnabled(fSelectedElement != null && fSelectedElement instanceof FileBasedStorageEditorInput);
-		}
-	}
-
-	class InputMoveAction extends Action implements IUpdate {
-		public InputMoveAction() {
-			super("Move Input");
-		}
-
-		public void run() {
-			super.run();
-			IEditorInput[] inputs = getSelectedInputs();
-			for (int i = 0; i < inputs.length; i++) {
-				if (inputs[i] instanceof FileBasedStorageEditorInput) {
-					((FileBasedStorageEditorInput) inputs[i]).elementMoved(inputs[i], inputs[i]);
-				}
-			}
-		}
-
-		public void update() {
-			setEnabled(fSelectedElement != null && fSelectedElement instanceof FileBasedStorageEditorInput);
-		}
-	}
-
-	class InputOpenAction extends Action {
-		public InputOpenAction() {
-			super("Open");
-		}
-
-		public void run() {
-			super.run();
-			IEditorInput[] inputs = getSelectedInputs();
-			for (int i = 0; i < inputs.length; i++) {
-				try {
-					getSite().getWorkbenchWindow().getActivePage().openEditor(inputs[i], getEditorId(inputs[i]));
-				}
-				catch (PartInitException e) {
-					openError(getSite().getWorkbenchWindow().getActivePage().getWorkbenchWindow().getShell(), "OpenSystemEditorAction.dialogTitle", e.getMessage(), e);
-				}
-			}
-		}
-	}
-
-	class InputReplaceContentsAction extends Action implements IUpdate {
-		public InputReplaceContentsAction() {
-			super("Replace Input's Contents");
-		}
-
-		public void run() {
-			super.run();
-			IEditorInput[] inputs = getSelectedInputs();
-			for (int i = 0; i < inputs.length; i++) {
-				((FileBasedStorageEditorInput) inputs[i]).elementContentAboutToBeReplaced();
-				((FileBasedStorageEditorInput) inputs[i]).elementContentReplaced();
-			}
-		}
-
-		public void update() {
-			setEnabled(fSelectedElement != null && fSelectedElement instanceof FileBasedStorageEditorInput);
-		}
-	}
-
-	class RemoveInputAction extends Action {
-		public RemoveInputAction() {
-			super("Remove");
-		}
-
-		public void run() {
-			super.run();
-			IEditorInput[] inputs = getSelectedInputs();
-			for (int i = 0; i < inputs.length; i++) {
-				fInputs.remove(inputs[i]);
-			}
-			fInputList.refresh();
-		}
-	}
-
-	class ReuseEditorAction extends Action implements IUpdate {
-		public ReuseEditorAction() {
-			super("Reuse Editor");
-		}
-
-		public void run() {
-			super.run();
-			IEditorInput[] inputs = getSelectedInputs();
-			for (int i = 0; i < inputs.length; i++) {
-				IEditorPart editor = getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-				if (editor instanceof IReusableEditor) {
-					getSite().getWorkbenchWindow().getActivePage().reuseEditor(((IReusableEditor) editor), inputs[i]);
-				}
-				else {
-					SSEUIPlugin.getDefault().getWorkbench().getDisplay().beep();
-				}
-			}
-		}
-
-		public void update() {
-			boolean enable = true;
-			try {
-				enable = fSelectedElement != null && getSite().getWorkbenchWindow().getActivePage().getActiveEditor() instanceof IReusableEditor;
-			}
-			catch (Exception e) {
-				enable = true;
-			}
-			setEnabled(enable);
-		}
-	}
-
-
-	public static final boolean provideIStorageFullPath = true;
-
-	/**
-	 * Open an error style dialog for PartInitException by including any extra
-	 * information from the nested CoreException if present.
-	 */
-	public static void openError(Shell parent, String title, String message, PartInitException exception) {
-		// Check for a nested CoreException
-		CoreException nestedException = null;
-		IStatus status = exception.getStatus();
-		if (status != null && status.getException() instanceof CoreException)
-			nestedException = (CoreException) status.getException();
-
-		if (nestedException != null) {
-			// Open an error dialog and include the extra
-			// status information from the nested CoreException
-			ErrorDialog.openError(parent, title, message, nestedException.getStatus());
-		}
-		else {
-			// Open a regular error dialog since there is no
-			// extra information to display
-			MessageDialog.openError(parent, title, message);
-		}
-	}
-
-	private List actions = null;
-
-	TableViewer fInputList = null;
-
-	List fInputs = new ArrayList(0);
-
-	Object fSelectedElement = null;
-
-
-	public ExtendedStorageEditorInputView() {
-		super();
-		actions = new ArrayList();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		fInputList = new TableViewer(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		fInputList.setContentProvider(new ArrayContentProvider());
-		fInputList.setLabelProvider(new EditorInputLabelProvider());
-		fInputList.addDoubleClickListener(new DoubleClickListener());
-		fInputList.getTable().setHeaderVisible(true);
-		fInputList.getTable().setLinesVisible(true);
-		String[] columns = new String[]{"Path", "Type"};
-		fInputList.setLabelProvider(new EditorInputLabelProvider());
-
-
-		TableLayout tlayout = new TableLayout();
-		CellEditor[] cellEditors = new CellEditor[5];
-		for (int i = 0; i < columns.length; i++) {
-			tlayout.addColumnData(new ColumnWeightData(1));
-			TableColumn tc = new TableColumn(fInputList.getTable(), SWT.NONE);
-			tc.setText(columns[i]);
-			tc.setResizable(true);
-			tc.setWidth(Display.getCurrent().getBounds().width / 14);
-		}
-		fInputList.setCellEditors(cellEditors);
-		fInputList.setColumnProperties(columns);
-
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		fInputList.getTable().setLayoutData(gd);
-
-		MenuManager menuManager = new MenuManager("#popup"); //$NON-NLS-1$
-		menuManager.setRemoveAllWhenShown(false);
-
-		menuManager.add(new InputOpenAction());
-		menuManager.add(new Separator());
-		menuManager.add(new InputMoveAction());
-		menuManager.add(new InputChangeDirtyStateAction());
-		menuManager.add(new InputDeleteAction());
-		menuManager.add(new InputReplaceContentsAction());
-		menuManager.add(new Separator());
-		menuManager.add(new RemoveInputAction());
-		Menu menu = menuManager.createContextMenu(fInputList.getControl());
-		fInputList.getControl().setMenu(menu);
-
-
-		SSETestsPlugin.getDefault().getPluginPreferences().setDefault(getInputsPreferenceName(), "");
-		String paths[] = StringUtils.unpack(SSETestsPlugin.getDefault().getPluginPreferences().getString(getInputsPreferenceName()));
-		for (int i = 0; i < paths.length; i++) {
-			if (paths[i].startsWith("S!")) {
-				fInputs.add(new FileBasedStorageEditorInput(new File(paths[i].substring(2))));
-			}
-			else if (paths[i].startsWith("F!")) {
-				fInputs.add(new FileEditorInput(ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(paths[i].substring(2)))));
-			}
-		}
-
-		fInputList.setInput(fInputs);
-		fInputList.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection sel = ((IStructuredSelection) event.getSelection());
-				fSelectedElement = sel.getFirstElement();
-			}
-		});
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPart#dispose()
-	 */
-	public void dispose() {
-		List paths = new ArrayList(0);
-		for (int i = 0; i < fInputs.size(); i++) {
-			try {
-				Object input = fInputs.get(i);
-				String path = null;
-				if (input instanceof FileBasedStorageEditorInput) {
-					path = "S!" + ((FileBasedStorageEditorInput) input).getFile().getCanonicalPath();
-				}
-				else if (input instanceof IFileEditorInput) {
-					path = "F!" + ((IFileEditorInput) input).getFile().getFullPath().toString();
-				}
-				if (path != null) {
-					paths.add(path);
-				}
-			}
-			catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		SSETestsPlugin.getDefault().getPluginPreferences().setValue(getInputsPreferenceName(), StringUtils.pack((String[]) paths.toArray(new String[0])));
-		SSETestsPlugin.getDefault().savePluginPreferences();
-	}
-
-	String getEditorId(IEditorInput input) {
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		IEditorRegistry editorRegistry = workbench.getEditorRegistry();
-		IContentType[] types = null;
-		String editorID = null;
-		if (input instanceof IStorageEditorInput) {
-			InputStream inputStream = null;
-			try {
-				inputStream = ((IStorageEditorInput) input).getStorage().getContents();
-			}
-			catch (CoreException e) {
-				e.printStackTrace();
-			}
-			try {
-				types = Platform.getContentTypeManager().findContentTypesFor(inputStream, input.getName());
-			}
-			catch (IOException e) {
-				e.printStackTrace();
-			}
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-			}
-			catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-
-		IEditorDescriptor descriptor = editorRegistry.getDefaultEditor(input.getName(), types[0]);
-		if (descriptor != null) {
-			editorID = descriptor.getId();
-		}
-		if (editorID == null) {
-			editorID = EditorsUI.DEFAULT_TEXT_EDITOR_ID;
-		}
-		return editorID;
-	}
-
-	/**
-	 * @return
-	 */
-	String getInputsPreferenceName() {
-		return "ExtendedStorageEditorInputView:inputs";
-	}
-
-	IEditorInput[] getSelectedInputs() {
-		ISelection selection = fInputList.getSelection();
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection sel = (IStructuredSelection) selection;
-			if (sel.isEmpty()) {
-				return new IEditorInput[0];
-			}
-			Object[] arr = sel.toArray();
-			IEditorInput[] inputs = new IEditorInput[arr.length];
-			System.arraycopy(arr, 0, inputs, 0, inputs.length);
-			return inputs;
-		}
-		return new IEditorInput[0];
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IViewPart#init(org.eclipse.ui.IViewSite)
-	 */
-	public void init(IViewSite site) throws PartInitException {
-		super.init(site);
-
-		site.getActionBars().getToolBarManager().add(rememberAction(new AddStorageInputAction()));
-		site.getActionBars().getToolBarManager().add(rememberAction(new AddFileInputAction()));
-		site.getActionBars().getToolBarManager().add(rememberAction(new ReuseEditorAction()));
-		site.getActionBars().getToolBarManager().add(rememberAction(new RemoveInputAction()));
-
-		site.getActionBars().getMenuManager().add(rememberAction(new InputOpenAction()));
-		site.getActionBars().getMenuManager().add(rememberAction(new ReuseEditorAction()));
-		site.getActionBars().getMenuManager().add(new Separator());
-		site.getActionBars().getMenuManager().add(rememberAction(new InputMoveAction()));
-		site.getActionBars().getMenuManager().add(rememberAction(new InputChangeDirtyStateAction()));
-		site.getActionBars().getMenuManager().add(rememberAction(new InputDeleteAction()));
-		site.getActionBars().getMenuManager().add(rememberAction(new InputReplaceContentsAction()));
-	}
-
-	IAction rememberAction(IAction action) {
-		actions.add(action);
-		return action;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		fInputList.getControl().setFocus();
-	}
-
-
-	protected void updateEnablement() {
-		for (int i = 0; i < actions.size(); i++) {
-			Object action = actions.get(i);
-			if (action instanceof IUpdate) {
-				((IUpdate) action).update();
-			}
-		}
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/Logger.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/Logger.java
deleted file mode 100644
index 937667615..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/Logger.java
+++ /dev/null
@@ -1,154 +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.sse.ui.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.ui.tests"; //$NON-NLS-1$
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSETestsPlugin.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSETestsPlugin.java
deleted file mode 100644
index 5c4d91e25..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSETestsPlugin.java
+++ /dev/null
@@ -1,66 +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.sse.ui.tests;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class SSETestsPlugin extends Plugin {
-	//The shared instance.
-	private static SSETestsPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-
-	/**
-	 * The constructor.
-	 */
-	public SSETestsPlugin() {
-		super();
-		plugin = this;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.sse.ui.tests.TestsPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static SSETestsPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle, or 'key' if not
-	 * found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = SSETestsPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java
deleted file mode 100644
index 12cb458c5..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/SSEUITestSuite.java
+++ /dev/null
@@ -1,34 +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.sse.ui.tests;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.sse.ui.tests.viewer.TestViewerConfiguration;
-
-/**
- * @author pavery
- */
-public class SSEUITestSuite extends TestSuite {
-	public static Test suite() {
-		return new SSEUITestSuite();
-	}
-
-	public SSEUITestSuite() {
-		super("SSE UI Test Suite");
-		addTest(new TestSuite(VerifyEditorPlugin.class));
-		addTest(new TestSuite(CommonEditorPreferencesTest.class));
-		addTest(new TestSuite(TestViewerConfiguration.class));
-		addTest(new TestSuite(TestStructuredTextEditor.class));
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java
deleted file mode 100644
index 36c0e5013..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestActionDelegate.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.sse.ui.tests;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-
-/**
- * @author nsd
- * 
- */
-public class TestActionDelegate extends Action implements IEditorActionDelegate {
-	IEditorPart editor = null;
-	IAction faction = null;
-
-	/**
-	 * 
-	 */
-	public TestActionDelegate() {
-		super();
-	}
-
-	/**
-	 * @param text
-	 */
-	public TestActionDelegate(String text) {
-		super(text);
-	}
-
-	/**
-	 * @param text
-	 * @param image
-	 */
-	public TestActionDelegate(String text, ImageDescriptor image) {
-		super(text, image);
-	}
-
-	/**
-	 * @param text
-	 * @param style
-	 */
-	public TestActionDelegate(String text, int style) {
-		super(text, style);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IEditorActionDelegate#setActiveEditor(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.ui.IEditorPart)
-	 */
-	public void setActiveEditor(IAction targetAction, IEditorPart targetEditor) {
-		editor = targetEditor;
-		faction = targetAction;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction runAction) {
-		MessageDialog.openInformation(editor.getEditorSite().getShell(), "Test", "Completed");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		// do nothing
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestEmailNotice.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestEmailNotice.java
deleted file mode 100644
index c4c3eeaaf..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestEmailNotice.java
+++ /dev/null
@@ -1,27 +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.sse.ui.tests;
-
-import junit.framework.TestCase;
-
-public class TestEmailNotice extends TestCase {
-	private boolean sendNotifications = false;
-
-	public TestEmailNotice() {
-		super();
-	}
-
-	public TestEmailNotice(String name) {
-		super(name);
-	}
-
-	public void testEmail() {
-		assertFalse("Simple test to be sure email gets sent on failure", sendNotifications);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java
deleted file mode 100644
index 81f3ae474..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestLineStyleProvider.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.sse.ui.tests;
-
-import java.util.Collection;
-
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.provisional.style.Highlighter;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.util.EditorUtility;
-
-public class TestLineStyleProvider implements LineStyleProvider {
-
-	Color foreground = null;
-
-	/**
-	 * 
-	 */
-	public TestLineStyleProvider() {
-		super();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.style.LineStyleProvider#init(org.eclipse.wst.sse.core.text.IStructuredDocument,
-	 *      org.eclipse.wst.sse.ui.style.Highlighter)
-	 */
-	public void init(IStructuredDocument document, Highlighter highlighter) {
-		// nothing to init
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.style.LineStyleProvider#prepareRegions(org.eclipse.jface.text.ITypedRegion,
-	 *      int, int, java.util.Collection)
-	 */
-	public boolean prepareRegions(ITypedRegion currentRegion, int start, int length, Collection styleRanges) {
-		// make everything bold grey
-		if (foreground == null)
-			foreground = EditorUtility.getColor(new RGB(127, 127, 127));
-		styleRanges.add(new StyleRange(start, length, foreground, null, SWT.BOLD));
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.style.LineStyleProvider#release()
-	 */
-	public void release() {
-		// nothing to release
-	}
-
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java
deleted file mode 100644
index eccd14b8f..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/TestStructuredTextEditor.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.sse.ui.tests;
-
-import java.io.ByteArrayInputStream;
-
-import junit.framework.TestCase;
-
-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.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.IShowInTargetList;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-
-public class TestStructuredTextEditor extends TestCase {
-	private final String PROJECT_NAME = "TestStructuredTextEditor";
-	private final String FILE_NAME = "testStructuredTextEditor.xml";
-
-	private static StructuredTextEditor fEditor;
-	private static IFile fFile;
-	private static boolean fIsSetup = false;
-
-	public TestStructuredTextEditor() {
-		super("TestStructredTextEditor");
-	}
-
-	protected void setUp() throws Exception {
-		if (!fIsSetup) {
-			// create project
-			createProject(PROJECT_NAME);
-			fFile = getOrCreateFile(PROJECT_NAME + "/" + FILE_NAME);
-			fIsSetup = true;
-		}
-
-		if (fIsSetup && fEditor == null) {
-			IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-			IWorkbenchPage page = workbenchWindow.getActivePage();
-			IEditorInput input = new FileEditorInput(fFile);
-			/*
-			 * This should take care of testing init, createPartControl,
-			 * beginBackgroundOperation, endBackgroundOperation methods
-			 */
-			IEditorPart part = page.openEditor(input, "org.eclipse.wst.sse.ui.StructuredTextEditor", true);
-			if (part instanceof StructuredTextEditor)
-				fEditor = (StructuredTextEditor) part;
-			else
-				assertTrue("Unable to open structured text editor", false);
-		}
-	}
-
-	protected void tearDown() throws Exception {
-		if (fEditor != null) {
-			/*
-			 * This should take care of testing close and dispose methods
-			 */
-			fEditor.close(false);
-			assertTrue("Unable to close editor", true);
-			fEditor = null;
-		}
-	}
-
-	private void createProject(String projName) {
-		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();
-		}
-	}
-
-	protected IFile getOrCreateFile(String filePath) {
-		IFile blankJspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath));
-		if (blankJspFile != null && !blankJspFile.exists()) {
-			try {
-				blankJspFile.create(new ByteArrayInputStream(new byte[0]), true, new NullProgressMonitor());
-			}
-			catch (CoreException e) {
-				e.printStackTrace();
-			}
-		}
-		return blankJspFile;
-	}
-
-	public void testDoSaving() {
-		fEditor.doRevertToSaved();
-		assertTrue("Unable to revert to saved", true);
-		fEditor.doSave(new NullProgressMonitor());
-		assertTrue("Unable to save", true);
-	}
-
-	public void testEditorContextMenuAboutToShow() {
-		IMenuManager menu = new MenuManager();
-		fEditor.editorContextMenuAboutToShow(menu);
-		assertTrue("Unable to prepare for context menu about to show", true);
-		menu.dispose();
-		menu = null;
-	}
-
-	public void testGetAdapter() {
-		Object adapter = fEditor.getAdapter(IShowInTargetList.class);
-		assertTrue("Get adapter for show in target failed", adapter instanceof IShowInTargetList);
-	}
-
-	public void testGetSetEditorPart() {
-		fEditor.setEditorPart(null);
-		assertTrue("Unable to set editor part", true);
-		IEditorPart part = fEditor.getEditorPart();
-		assertTrue("Did not get expected editor part", part instanceof StructuredTextEditor);
-	}
-
-	public void testInitializeDocumentProvider() {
-		fEditor.initializeDocumentProvider(null);
-		assertTrue("Unable to initialize document provider", true);
-	}
-
-	public void testGetOrientation() {
-		int or = fEditor.getOrientation();
-		assertEquals(SWT.LEFT_TO_RIGHT, or);
-	}
-
-	public void testGetSelectionProvider() {
-		ISelectionProvider provider = fEditor.getSelectionProvider();
-		assertNotNull("Editor's selection provider was null", provider);
-	}
-
-	public void testGetTextViewer() {
-		StructuredTextViewer viewer = fEditor.getTextViewer();
-		assertNotNull("Editor's text viewer was null", viewer);
-	}
-
-	public void testRememberRestoreSelection() {
-		fEditor.rememberSelection();
-		assertTrue("Unable to remember editor selection", true);
-		fEditor.restoreSelection();
-		assertTrue("Unable to restore editor selection", true);
-	}
-
-	public void testSafelySanityCheck() {
-		fEditor.safelySanityCheckState(fEditor.getEditorInput());
-		assertTrue("Unable to safely sanity check editor state", true);
-	}
-
-	public void testShowBusy() {
-		fEditor.showBusy(false);
-		assertTrue("Unable to show editor is busy", true);
-	}
-
-	public void testUpdate() {
-		fEditor.update();
-		assertTrue("Unable to update editor", true);
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/VerifyEditorPlugin.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/VerifyEditorPlugin.java
deleted file mode 100644
index 6753f6aa3..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/VerifyEditorPlugin.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.wst.sse.ui.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-
-/*****************************************************************************
- * 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
- * 
- ****************************************************************************/
-
-public class VerifyEditorPlugin extends TestCase {
-
-	List colorList = new ArrayList();
-
-	public void testPluginExists() {
-		Plugin plugin = null;
-		try {
-			plugin = SSEUIPlugin.getDefault();
-
-		}
-		catch (Exception e) {
-			plugin = null;
-		}
-		assertNotNull("sse editor plugin could not be instantiated", plugin);
-
-	}
-
-	/**
-	 * The purpose of this test is just to test if we can directly create lots
-	 * of RBG colors, even if display set to "256" (on Linux). And, BTW, it
-	 * does not fail even with 256 colors set, at least on Linux, in dev. env.
-	 * Varying all three RGB numbers, though, it is easy to run out of memory!
-	 * 
-	 */
-	public void testColorHandles() {
-		Display display = Display.getCurrent();
-		if (display == null)
-			display = Display.getDefault();
-		assertNotNull("display could not be instantiated", display);
-		for (int i = 0; i < 256; i++) {
-			for (int j = 0; j < 256; j++) {
-				// 256 cubed runs out of memory
-				// for (int k = 0; k < 256; k++) {
-				colorList.add(new Color(display, new RGB(i, j, 50)));
-				// }
-
-			}
-
-		}
-		// if we get this far without error, all is ok.
-		assertTrue(true);
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/viewer/TestViewerConfiguration.java b/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/viewer/TestViewerConfiguration.java
deleted file mode 100644
index ab1498215..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/src/org/eclipse/wst/sse/ui/tests/viewer/TestViewerConfiguration.java
+++ /dev/null
@@ -1,270 +0,0 @@
-package org.eclipse.wst.sse.ui.tests.viewer;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IInformationControlCreator;
-import org.eclipse.jface.text.ITextDoubleClickStrategy;
-import org.eclipse.jface.text.IUndoManager;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.hyperlink.IHyperlinkPresenter;
-import org.eclipse.jface.text.information.IInformationPresenter;
-import org.eclipse.jface.text.presentation.IPresentationReconciler;
-import org.eclipse.jface.text.reconciler.IReconciler;
-import org.eclipse.jface.text.source.IAnnotationHover;
-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.PlatformUI;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.text.IStructuredPartitions;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.sse.ui.tests.Logger;
-
-public class TestViewerConfiguration extends TestCase {
-
-	private StructuredTextViewerConfiguration fConfig = null;
-	private boolean fDisplayExists = true;
-	private StructuredTextViewer fViewer = null;
-	private boolean isSetup = false;
-
-	public TestViewerConfiguration() {
-		super("TestViewerConfiguration");
-	}
-
-	protected void setUp() throws Exception {
-
-		super.setUp();
-		if (!this.isSetup) {
-			setUpViewerConfiguration();
-			this.isSetup = true;
-		}
-	}
-
-	private void setUpViewerConfiguration() {
-		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
-			fViewer = new StructuredTextViewer(parent, null, null, false, SWT.NONE);
-			fConfig = new StructuredTextViewerConfiguration();
-		}
-		else {
-			fDisplayExists = false;
-			Logger.log(Logger.INFO, "Remember, viewer configuration tests are not run because workbench is not open (normal on build machine)");
-		}
-	}
-
-	public void testGetAnnotationHover() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IAnnotationHover hover = fConfig.getAnnotationHover(fViewer);
-		assertNotNull("AnnotationHover is null", hover);
-	}
-
-	/**
-	 * Not necessary
-	 */
-	public void testGetAutoEditStrategies() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IAutoEditStrategy[] strategies = fConfig.getAutoEditStrategies(fViewer, IStructuredPartitions.DEFAULT_PARTITION);
-		assertNotNull(strategies);
-		assertTrue("there are no auto edit strategies", strategies.length > 0);
-	}
-
-	/**
-	 * Not necessary
-	 */
-	public void testGetConfiguredContentTypes() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String[] configuredContentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		assertNotNull(configuredContentTypes);
-		assertTrue(configuredContentTypes.length == 1);
-	}
-
-	public void testGetConfiguredDocumentPartitioning() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String partitioning = fConfig.getConfiguredDocumentPartitioning(fViewer);
-		assertEquals(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING, partitioning);
-	}
-
-	public void testGetConfiguredTextHoverStateMasks() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		int[] masks = fConfig.getConfiguredTextHoverStateMasks(fViewer, IStructuredPartitions.DEFAULT_PARTITION);
-		assertEquals(2, masks.length);
-	}
-
-	public void testGetContentAssistant() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IContentAssistant ca = fConfig.getContentAssistant(fViewer);
-		assertNotNull("there is no content assistant", ca);
-	}
-
-	public void testGetContentFormatter() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IContentFormatter cf = fConfig.getContentFormatter(fViewer);
-		assertNull("there is a content formatter", cf);
-	}
-
-	/**
-	 * Not necessary
-	 */
-	public void testGetDoubleClickStrategy() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			ITextDoubleClickStrategy strategy = fConfig.getDoubleClickStrategy(fViewer, contentTypes[i]);
-			if (strategy != null) {
-				return;
-			}
-		}
-		assertTrue("there are no configured double click strategies", false);
-	}
-
-	/**
-	 * Not necessary
-	 */
-	public void testGetHyperlinkDetectors() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IHyperlinkDetector[] detectors = fConfig.getHyperlinkDetectors(fViewer);
-		assertNotNull("there are no hyperlink detectors", detectors);
-		assertTrue("there are no hyperlink detectors", detectors.length > 0);
-	}
-
-	public void testGetHyperlinkPresenter() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IHyperlinkPresenter presenter = fConfig.getHyperlinkPresenter(fViewer);
-		assertNotNull("hyperlink presenter shouldn't be null", presenter);
-	}
-
-	public void testGetInformationControlCreator() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IInformationControlCreator infoControlCreator = fConfig.getInformationControlCreator(fViewer);
-		assertNotNull("info control creator was null", infoControlCreator);
-	}
-
-	public void testGetInformationPresenter() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IInformationPresenter presenter = fConfig.getInformationPresenter(fViewer);
-		assertNotNull("InformationPresenter was null", presenter);
-	}
-
-	public void testGetLineStyleProviders() {
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		// there should be no linestyleproviders for default
-		String[] contentTypes = fConfig.getConfiguredContentTypes(fViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-			LineStyleProvider providers[] = fConfig.getLineStyleProviders(fViewer, contentTypes[i]);
-			assertNull("line style providers is not null", providers);
-		}
-	}
-
-	/**
-	 * Not necessary
-	 */
-	public void testGetOverviewRulerAnnotationHover() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IAnnotationHover annotationHover = fConfig.getOverviewRulerAnnotationHover(fViewer);
-		assertNotNull("annotation hover was null", annotationHover);
-	}
-
-	public void testGetPresentationReconciler() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IPresentationReconciler presentationReconciler = fConfig.getPresentationReconciler(fViewer);
-		// our default presentation reconciler is null
-		assertNull("presentation reconciler was not null", presentationReconciler);
-	}
-
-	public void testGetReconciler() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IReconciler r = fConfig.getReconciler(fViewer);
-		assertNotNull("Reconciler was null", r);
-	}
-
-	public void testGetUndoManager() {
-
-		// probably no display
-		if (!fDisplayExists)
-			return;
-
-		IUndoManager undoManager = fConfig.getUndoManager(fViewer);
-		assertNotNull("undo manager was null", undoManager);
-	}
-}
diff --git a/tests/org.eclipse.wst.sse.ui.tests/test.xml b/tests/org.eclipse.wst.sse.ui.tests/test.xml
deleted file mode 100644
index ce65ee041..000000000
--- a/tests/org.eclipse.wst.sse.ui.tests/test.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-    name="testsuite"
-    default="run"
-    basedir=".">
-    
-    <!-- The following properties should be passed into this script -->
-    <!-- ${eclipse-home}   -->
-    <!-- ${buildDirectory}  -->
-    <!-- ${buildLabel}        -->
-
-    <!-- should be little need to change what's above  -->
-
-
-    <property
-        name="plugin-name"
-        value="org.eclipse.wst.sse.ui.tests" />
-    <property
-        name="classname"
-        value="org.eclipse.wst.sse.ui.tests.SSEUITestSuite" />
-    <property
-        name="testType"
-        value="ui-test" />
-
-    <!-- should be little need to change what's below -->
-
-    <echo message="basedir: ${basedir}" />
-    <echo message="eclipse-home: ${eclipse-home}" />
-    <echo message="buildDirectory: ${buildDirectory}" />
-    <echo message="plugin-name: ${plugin-name}" />
-    <echo message="classname: ${classname}" />
-    <echo message="testType ${testType}" />
-
-
-    <property
-        name="library-file"
-        value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
-    <property
-        name="workspace"
-        value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-        
-    <!-- This target holds all initialization code that needs to be done for -->
-    <!-- all tests that are to be run. Initialization for individual tests -->
-    <!-- should be done within the body of the suite target. -->
-    <target name="init">
-        <tstamp />
-        <delete>
-            <fileset
-                dir="${eclipse-home}"
-                includes="${plugin-name}.*xml" />
-        </delete>
-        <!-- make directory, in case path doesn't exist yet -->
-        <mkdir dir="${workspace}" />
-        <!--  but delete to make sure fresh contents-->
-        <delete
-            dir="${workspace}"
-            quiet="true" />
-
-    </target>
-
-    <!-- This target defines the tests that need to be run. -->
-    <target name="suite">
-
-        <ant
-            target="${testType}"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="data-dir"
-                value="${workspace}" />
-            <property
-                name="plugin-name"
-                value="${plugin-name}" />
-            <property
-                name="classname"
-                value="${classname}" />
-            <property
-                name="plugin-path"
-                value="${eclipse-home}/plugins/${plugin-name}" />
-        </ant>
-
-        <copy
-            failonerror="false"
-            file="${workspace}/.metadata/.log"
-            tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
-    </target>
-
-    <!-- This target holds code to cleanup the testing environment after -->
-    <!-- after all of the tests have been run. You can use this target to -->
-    <!-- delete temporary files that have been created. -->
-    <target name="cleanup">
-        <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
-        <!-- <delete dir="${workspace}" quiet="true" /> -->
-    </target>
-
-    <!-- This target runs the test suite. Any actions that need to happen -->
-    <!-- after all the tests have been run should go here. -->
-    <target
-        name="run"
-        depends="init,suite,cleanup">
-        <ant
-            target="collect"
-            antfile="${library-file}"
-            dir="${eclipse-home}">
-            <property
-                name="includes"
-                value="${plugin-name}.*xml" />
-            <property
-                name="output-file"
-                value="${plugin-name}.xml" />
-        </ant>
-    </target>
-
-</project>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/.classpath b/tests/org.eclipse.wst.xml.catalog.tests/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/.cvsignore b/tests/org.eclipse.wst.xml.catalog.tests/.cvsignore
deleted file mode 100644
index ba077a403..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/.project b/tests/org.eclipse.wst.xml.catalog.tests/.project
deleted file mode 100644
index c4175149e..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.core</name>
-	<comment></comment>
-	<projects></projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.catalog.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 6c7d10efc..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Mar 25 17:34:01 EST 2005
-eclipse.preferences.version=1
-encoding//data/PublicationCatalogue/Catalogue.xsd=UTF8
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 55f6cc3f4..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Test Plug-in
-Bundle-SymbolicName: org.eclipse.wst.xml.catalog.tests; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.xml.catalog.tests.internal.TestPlugin
-Bundle-Vendor: IBM
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.catalog.tests.internal,
- org.eclipse.wst.xml.resolver.tools.tests.internal,
- org.eclipse.wst.xml.uriresolver.validation.tests.internal
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.wst.xml.core,
- org.apache.xerces,
- org.eclipse.xsd
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/about.html b/tests/org.eclipse.wst.xml.catalog.tests/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.wst.xml.catalog.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.xml.catalog.tests/build.properties b/tests/org.eclipse.wst.xml.catalog.tests/build.properties
deleted file mode 100644
index 46ff36bf4..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.catalogtests.jar = src/
-output.catalogtests.jar = bin/
-bin.includes = actual_results/,\
-               data/,\
-               jars/,\
-               plugin.xml,\
-               test.xml,\
-               META-INF/,\
-               catalogtests.jar,\
-               about.html
-
-src.includes = actual_results/
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd b/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd
deleted file mode 100644
index 0737ba658..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.dtd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!ELEMENT Invoice (Header,Item+)>
-<!ELEMENT Header (Date,BillTo)>
-<!ATTLIST Header
- invoiceNumber CDATA #REQUIRED
->
-<!ELEMENT Item (description*)>
-<!ATTLIST Item
- price CDATA #REQUIRED
- discount (promotion | regular) "regular"
->
-<!ELEMENT Date ((Month,Day,Year)|(Day,Month,Year))>
-<!ELEMENT BillTo (Address)>
-<!ATTLIST BillTo
- custNumber ID #REQUIRED
- name CDATA #IMPLIED
- phone CDATA #IMPLIED
->
-<!ELEMENT description (#PCDATA)>
-<!ELEMENT Address (street1,street2?,city,(state|province),zip,country?)>
-<!ELEMENT street1 (#PCDATA)>
-<!ELEMENT street2 (#PCDATA)>
-<!ELEMENT city (#PCDATA)>
-<!ELEMENT state (#PCDATA)>
-<!ELEMENT province (#PCDATA)>
-<!ELEMENT zip (#PCDATA)>
-<!ELEMENT country (#PCDATA)>
-<!ELEMENT Month (#PCDATA)>
-<!ELEMENT Day (#PCDATA)>
-<!ELEMENT Year (#PCDATA)>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.xml
deleted file mode 100644
index 6afe3978b..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Invoice/Invoice.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE Invoice PUBLIC "InvoiceId_test" "Invoice.dtd" >
-<Invoice>
-  <Header invoiceNumber="12345">
-    <Date>
-      <Month>July</Month>
-      <Day>15</Day>
-      <Year>2001</Year>
-    </Date>
-    <BillTo custNumber="X5739" name="Milton McGoo" phone="416-448-4414">
-      <Address>
-        <street1>IBM</street1>
-        <street2>1150 Eglinton Ave East</street2>
-        <city>Toronto</city>
-        <state>Ontario</state>
-        <zip>M3C 1H7</zip>
-        <country>Canada</country>
-      </Address>
-    </BillTo>
-  </Header>
-  <Item discount="promotion" price="57">
-    <description>high speed 3D graphics card</description>
-  </Item>
-</Invoice>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal-schema.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal-schema.xml
deleted file mode 100644
index c2f725b56..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal-schema.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<personnel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:noNamespaceSchemaLocation='personal.xsd'>
-
-  <person id="Big.Boss" >
-    <name><family>Boss</family> <given>Big</given></name>
-    <email>chief@foo.com</email>
-    <link subordinates="one.worker two.worker three.worker four.worker five.worker"/>
-  </person>
-
-  <person id="one.worker">
-    <name><family>Worker</family> <given>One</given></name>
-    <email>one@foo.com</email>
-    <link manager="Big.Boss"/>
-  </person>
-
-  <person id="two.worker">
-    <name><family>Worker</family> <given>Two</given></name>
-    <email>two@foo.com</email>
-    <link manager="Big.Boss"/>
-  </person>
-
-  <person id="three.worker">
-    <name><family>Worker</family> <given>Three</given></name>
-    <email>three@foo.com</email>
-    <link manager="Big.Boss"/>
-  </person>
-
-  <person id="four.worker">
-    <name><family>Worker</family> <given>Four</given></name>
-    <email>four@foo.com</email>
-    <link manager="Big.Boss"/>
-  </person>
-
-  <person id="five.worker">
-    <name><family>Worker</family> <given>Five</given></name>
-    <email>five@foo.com</email>
-    <link manager="Big.Boss"/>
-  </person>
-
-</personnel>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.dtd b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.dtd
deleted file mode 100644
index c64e48ab3..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml encoding="UTF-8"?>
-<!ELEMENT personnel (person)+>
-
-<!ELEMENT person (name,email*,url*,link?)>
-<!ATTLIST person id ID #REQUIRED>
-<!ATTLIST person note CDATA #IMPLIED>
-<!ATTLIST person contr (true|false) 'false'>
-<!ATTLIST person salary CDATA #IMPLIED>
-
-<!ELEMENT name ((family,given)|(given,family))>
-
-<!ELEMENT family (#PCDATA)>
-
-<!ELEMENT given (#PCDATA)>
-
-<!ELEMENT email (#PCDATA)>
-
-<!ELEMENT url EMPTY>
-<!ATTLIST url href CDATA 'http://'>
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link manager IDREF #IMPLIED>
-<!ATTLIST link subordinates IDREFS #IMPLIED>
-
-<!NOTATION gif PUBLIC '-//APP/Photoshop/4.0' 'photoshop.exe'>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xml
deleted file mode 100644
index 9c3e43871..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE personnel SYSTEM "http://personal/personal.dtd">
-<personnel>
-
-  <person id="Big.Boss">
-    <name><family>Boss</family> <given>Big</given></name>
-    <email>chief@foo.com</email>
-    <link subordinates="one.worker two.worker three.worker four.worker five.worker"/>
-  </person>
-
-  <person id="one.worker">
-    <name><family>Worker</family> <given>One</given></name>
-    <email>one@foo.com</email>
-    <link manager="Big.Boss"/>
-  </person>
-
-  <person id="two.worker">
-    <name><family>Worker</family> <given>Two</given></name>
-    <email>two@foo.com</email>
-    <link manager="Big.Boss"/>
-  </person>
-
-  <person id="three.worker">
-    <name><family>Worker</family> <given>Three</given></name>
-    <email>three@foo.com</email>
-    <link manager="Big.Boss"/>
-  </person>
-
-  <person id="four.worker">
-    <name><family>Worker</family> <given>Four</given></name>
-    <email>four@foo.com</email>
-    <link manager="Big.Boss"/>
-  </person>
-
-  <person id="five.worker">
-    <name><family>Worker</family> <given>Five</given></name>
-    <email>five@foo.com</email>
-    <link manager="Big.Boss"/>
-  </person>
-
-</personnel>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xsd
deleted file mode 100644
index 05e3183f5..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/Personal/personal.xsd
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'>
-
- <xs:element name="personnel">
-  <xs:complexType>
-   <xs:sequence>
-     <xs:element ref="person" minOccurs='1' maxOccurs='unbounded'/>
-   </xs:sequence>
-  </xs:complexType>
-
-  <xs:unique name="unique1">
-   <xs:selector xpath="person"/>
-   <xs:field xpath="name/given"/>
-   <xs:field xpath="name/family"/>
-  </xs:unique>
-  <xs:key name='empid'>
-   <xs:selector xpath="person"/>
-   <xs:field xpath="@id"/>
-  </xs:key>
-  <xs:keyref name="keyref1" refer='empid'>
-   <xs:selector xpath="person"/> 
-   <xs:field xpath="link/@manager"/>  
-  </xs:keyref>
-
- </xs:element>
-
- <xs:element name="person">
-  <xs:complexType>
-   <xs:sequence>
-     <xs:element ref="name"/>
-     <xs:element ref="email" minOccurs='0' maxOccurs='unbounded'/>
-     <xs:element ref="url"   minOccurs='0' maxOccurs='unbounded'/>
-     <xs:element ref="link"  minOccurs='1' maxOccurs='1'/>
-   </xs:sequence>
-   <xs:attribute name="id"  type="xs:ID" use='required'/>
-   <xs:attribute name="note" type="xs:string"/>
-   <xs:attribute name="contr" default="false">
-    <xs:simpleType>
-     <xs:restriction base = "xs:string">
-       <xs:enumeration value="true"/>
-       <xs:enumeration value="false"/>
-     </xs:restriction>
-    </xs:simpleType>
-   </xs:attribute>
-   <xs:attribute name="salary" type="xs:integer"/>
-  </xs:complexType>
- </xs:element>
-
- <xs:element name="name">
-  <xs:complexType>
-   <xs:all>
-    <xs:element ref="family"/>
-    <xs:element ref="given"/>
-   </xs:all>
-  </xs:complexType>
- </xs:element>
-
- <xs:element name="family" type='xs:string'/>
-
- <xs:element name="given" type='xs:string'/>
-
- <xs:element name="email" type='xs:string'/>
-
- <xs:element name="url">
-  <xs:complexType>
-   <xs:attribute name="href" type="xs:string" default="http://"/>
-  </xs:complexType>
- </xs:element>
-
- <xs:element name="link">
-  <xs:complexType>
-   <xs:attribute name="manager" type="xs:IDREF"/>
-   <xs:attribute name="subordinates" type="xs:IDREFS"/>
-  </xs:complexType>
- </xs:element>
-
- <xs:notation name='gif' public='-//APP/Photoshop/4.0' system='photoshop.exe'/>
-
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xml
deleted file mode 100644
index e66621d9b..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<c:Catalogue xmlns:c="http://www.eclipse.org/webtools/Catalogue/test" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue/test Catalogue.xsd ">
-	<c:Book>
-		<title>Professional XML Schema</title>
-		<date>2001</date>
-		<isbn>1-861005-47-4</isbn>
-		<publisher>Wrox Press</publisher>
-	</c:Book>
-	<c:Magazine>
-		<title>WebSphere Developer's Journal</title>
-		<date>2001</date>
-	</c:Magazine>
-	<c:Book>
-		<title>Java and XSLT</title>
-		<date>2001</date>
-		<isbn>0-596-00143-6</isbn>
-		<publisher>O'Reilly</publisher>
-	</c:Book>
-</c:Catalogue>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xsd
deleted file mode 100644
index 16686422f..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PublicationCatalogue/Catalogue.xsd
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://www.eclipse.org/webtools/Catalogue/test"
-	xmlns="http://www.w3.org/2001/XMLSchema"
-	xmlns:c="http://www.eclipse.org/webtools/Catalogue/test"
-	xsi:schemaLocation="http://www.eclipse.org/webtools/Catalogue/test Catalogue.xsd ">
-	<group name="test">
-		<sequence>
-			<element name="test1"></element>
-		</sequence>
-	</group>
-	<complexType name="PublicationType">
-		<sequence>
-			<element name="title" type="string"></element>
-			<element name="author" type="string" minOccurs="0"
-				maxOccurs="unbounded">
-			</element>
-			<element name="date" type="gYear"></element>
-		</sequence>
-	</complexType>
-
-	<complexType name="BookType">
-		<complexContent>
-			<extension base="c:PublicationType">
-				<sequence>
-					<element name="isbn" type="string" />
-					<element name="publisher" type="string" />
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<complexType name="MagazineType">
-		<complexContent>
-			<restriction base="c:PublicationType">
-				<sequence>
-					<element name="title" type="string" />
-					<element name="author" type="string" minOccurs="0"
-						maxOccurs="0" />
-					<element name="date" type="gYear"></element>
-				</sequence>
-			</restriction>
-		</complexContent>
-	</complexType>
-
-	<element name="Publication" type="c:PublicationType"
-		abstract="true">
-	</element>
-
-	<element name="Book" type="c:BookType"
-		substitutionGroup="c:Publication">
-	</element>
-
-	<element name="Magazine" type="c:MagazineType"
-		substitutionGroup="c:Publication">
-	</element>
-
-	<element name="Catalogue">
-		<complexType>
-			<sequence>
-				<element ref="c:Publication" maxOccurs="unbounded"></element>
-			</sequence>
-		</complexType>
-	</element>
-
-</schema>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xml
deleted file mode 100644
index 12bd7e672..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<po:purchaseOrder orderDate="2001-01-01" xmlns:po="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com PurchaseOrder.xsd">
-  <shipTo country="US">
-    <name>Alice Smith</name>
-    <street>125 Maple Street</street>
-    <city>Mill Valley</city>
-    <state>CA</state>
-    <zip>90952</zip>
-  </shipTo>
-  <billTo country="US">
-    <name>Robert Smith</name>
-    <street>8 Oak Avenue</street>
-    <city>Old Town</city>
-    <state>PA</state>
-    <zip>95819</zip>
-  </billTo>
-  <po:comment>Hurry, my lawn is going wild!</po:comment>
-  <items>
-    <item partNum="872-AA">
-      <productName>Lawnmower</productName>
-      <quantity>1</quantity>
-      <USPrice>148.95</USPrice>
-      <po:comment>Confirm this is electric</po:comment>
-    </item>
-    <item partNum="926-AA">
-      <productName>Baby Monitor</productName>
-      <quantity>1</quantity>
-      <USPrice>39.98</USPrice>
-      <shipDate>2001-07-21</shipDate>
-    </item>
-  </items>
-</po:purchaseOrder>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xsd
deleted file mode 100644
index d0fb09412..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/PurchaseOrder.xsd
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.ibm.com"
- xmlns:po="http://www.ibm.com">
-    <annotation>
-        <documentation xml:lang="en">
-            Purchase order schema example from XML Schema Part 0: Primer
-        
-            Copyright 2001, IBM Corp. All rights reserved
-            Copyright 2001, World Wide Web Consortium, 
-            (Massachusetts Institute of Technology, Institut National de Recherche en Informatiqueet en Automatique, Keio University).
-            All Rights Reserved.
-        </documentation>
-    </annotation>
-
-    <element name="purchaseOrder" type="po:PurchaseOrderType"/>
-
-    <element name="comment" type="string"/>
-
-    <complexType name="PurchaseOrderType">
-        <sequence>
-            <element name="shipTo" type="po:USAddress"/>
-            <element name="billTo" type="po:USAddress"/>
-            <element ref="po:comment" minOccurs="0"/>
-            <element name="items" type="po:Items"/>
-        </sequence>
-        <attribute name="orderDate" type="date"/>
-    </complexType>
-
-    <complexType name="USAddress">
-        <sequence>
-            <element name="name" type="string"/>
-            <element name="street" type="string"/>
-            <element name="city" type="string"/>
-            <element name="state" type="po:USState"/>
-            <element name="zip" type="decimal"/>
-        </sequence>
-        <attribute name="country" type="NMTOKEN" fixed="US"/>
-    </complexType>
-
-    <complexType name="Items">
-        <sequence>
-            <element name="item" minOccurs="0" maxOccurs="unbounded">
-                <complexType>
-                    <sequence>
-                        <element name="productName" type="string"/>
-                        <element name="quantity">
-                            <simpleType>
-                                <restriction base="positiveInteger">
-                                    <maxExclusive value="100"/>
-                                </restriction>
-                            </simpleType>
-                        </element>
-                        <element name="USPrice" type="decimal"/>
-                        <element ref="po:comment" minOccurs="0"/>
-                        <element name="shipDate" type="date" minOccurs="0"/>
-                    </sequence>
-                    <attribute name="partNum" type="po:SKU" use="required"/>
-                </complexType>
-            </element>
-        </sequence>
-    </complexType>
-
-    <simpleType name="SKU">
-        <restriction base="string">
-            <pattern value="\d{3}-[A-Z]{2}"/>
-        </restriction>
-    </simpleType>
-    
-    <simpleType name="USState">
-        <restriction base="string">
-            <enumeration value="CA"></enumeration>
-            <enumeration value="PA"></enumeration>
-            <enumeration value="AR"></enumeration>
-        </restriction>
-    </simpleType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/address.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/address.xsd
deleted file mode 100644
index 26ea44230..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/address.xsd
+++ /dev/null
@@ -1,68 +0,0 @@
-<schema targetNamespace="http://www.example.com/IPO"
-        xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:ipo="http://www.example.com/IPO">
-
- <annotation>
-  <documentation xml:lang="en">
-   Addresses for International Purchase order schema
-   Copyright 2000 Example.com. All rights reserved.
-  </documentation> 
- </annotation>
-
- <complexType name="Address">
-  <sequence>
-   <element name="name"   type="string"/>
-   <element name="street" type="string"/>
-   <element name="city"   type="string"/>
-  </sequence>
- </complexType>
-
- <complexType name="USAddress">
-  <complexContent>
-   <extension base="ipo:Address">
-    <sequence>
-     <element name="state" type="ipo:USState"/>
-     <element name="zip"   type="positiveInteger"/>
-    </sequence>
-   </extension>
-  </complexContent>
- </complexType>
-
- <complexType name="UKAddress">
-  <complexContent>
-   <extension base="ipo:Address">
-    <sequence>
-     <element name="postcode" type="ipo:UKPostcode"/>
-    </sequence>
-    <attribute name="exportCode" type="positiveInteger" fixed="1"/>
-   </extension>
-  </complexContent>
- </complexType>
-
- <!-- other Address derivations for more countries --> 
-
- <simpleType name="USState">
-  <restriction base="string">
-   <enumeration value="AK"/>
-   <enumeration value="AL"/>
-   <enumeration value="AR"/>
-   <!-- and so on ... -->
-  </restriction>
- </simpleType>
-
- <!-- simple type definition for Postcode -->
- <simpleType name="Postcode">
-  <restriction base="string">
-  </restriction>
- </simpleType>
-
- <!-- simple type definition for UKPostcode -->
- <simpleType name="UKPostcode">
-  <restriction base="ipo:Postcode">
-    <pattern value="[A-Z]{2}\d\s\d[A-Z]{2}"/>
-  </restriction>
- </simpleType>
-
-
-</schema>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xml
deleted file mode 100644
index d483adedd..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<ipo:purchaseOrder
-  orderDate="2001-01-01" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ipo="http://www.example.com/IPO" xsi:schemaLocation="http://www.example.com/IPO ipo.xsd ">
-
-    <shipTo exportCode="1" xsi:type="ipo:UKAddress">
-        <name>Helen Zoe</name>
-        <street>47 Eden Street</street>
-        <city>Cambridge</city>
-        <postcode>CB1 1JR</postcode>
-    </shipTo>
-
-    <billTo xsi:type="ipo:USAddress">
-        <name>Robert Smith</name>
-        <street>8 Oak Avenue</street>
-        <city>Old Town</city>
-        <state>AR</state>
-        <zip>95819</zip>
-    </billTo>
-
-    <items>
-        <item partNum="833-AA">
-            <productName>Lapis necklace</productName>
-            <quantity>1</quantity>
-            <USPrice>99.95</USPrice>
-            <ipo:comment>Want this for the holidays!</ipo:comment>
-            <shipDate>1999-12-05</shipDate>
-        </item>
-    </items>
-</ipo:purchaseOrder>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xsd
deleted file mode 100644
index 7a63d01d5..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<schema targetNamespace="http://www.example.com/IPO"
-        xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:ipo="http://www.example.com/IPO">
-
- <annotation>
-  <documentation xml:lang="en">
-   International Purchase order schema for Example.com
-   Copyright 2000 Example.com. All rights reserved.
-  </documentation> 
- </annotation>
-
- <!-- include address constructs -->
- <include
-  schemaLocation="address.xsd"/>
-
- <element name="purchaseOrder" type="ipo:PurchaseOrderType"/>
-
- <element name="comment" type="string"/>
-
- <complexType name="PurchaseOrderType">
-  <sequence>
-   <element name="shipTo"     type="ipo:Address"/>
-   <element name="billTo"     type="ipo:Address"/>
-   <element ref="ipo:comment" minOccurs="0"/>
-   <element name="items"      type="ipo:Items"/>
-  </sequence>
-  <attribute name="orderDate" type="date"/>
- </complexType>
-
- <complexType name="Items">
-  <sequence>
-   <element name="item" minOccurs="0" maxOccurs="unbounded">
-    <complexType>
-     <sequence>
-      <element name="productName" type="string"/>
-      <element name="quantity">
-       <simpleType>
-        <restriction base="positiveInteger">
-         <maxExclusive value="100"/>
-        </restriction>
-       </simpleType>
-      </element>
-      <element name="USPrice"    type="decimal"/>
-      <element ref="ipo:comment" minOccurs="0"/>
-      <element name="shipDate"   type="date" minOccurs="0"/>
-     </sequence>
-     <attribute name="partNum" type="ipo:SKU" use="required"/>
-    </complexType>
-   </element>
-  </sequence>
- </complexType>
-
- <simpleType name="SKU">
-  <restriction base="string">
-   <pattern value="\d{3}-[A-Z]{2}"/>
-  </restriction>
- </simpleType>
-
-</schema>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo_.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo_.xsd
deleted file mode 100644
index 436d49da3..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/ipo_.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-<schema targetNamespace="http://www.example.com/IPO"
-        xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:ipo="http://www.example.com/IPO">
-
- <annotation>
-  <documentation xml:lang="en">
-   International Purchase order schema for Example.com
-   Copyright 2000 Example.com. All rights reserved.
-  </documentation> 
- </annotation>
-
- <!-- include address constructs -->
- <include
-  schemaLocation="address_.xsd"/>
-
- <element name="purchaseOrder" type="ipo:PurchaseOrderType"/>
-
- <element name="comment" type="string"/>
-
- <complexType name="PurchaseOrderType">
-  <sequence>
-   <element name="shipTo"     type="ipo:Address"/>
-   <element name="billTo"     type="ipo:Address"/>
-   <element ref="ipo:comment" minOccurs="0"/>
-   <element name="items"      type="ipo:Items"/>
-  </sequence>
-  <attribute name="orderDate" type="date"/>
- </complexType>
-
- <complexType name="Items">
-  <sequence>
-   <element name="item" minOccurs="0" maxOccurs="unbounded">
-    <complexType>
-     <sequence>
-      <element name="productName" type="string"/>
-      <element name="quantity">
-       <simpleType>
-        <restriction base="positiveInteger">
-         <maxExclusive value="100"/>
-        </restriction>
-       </simpleType>
-      </element>
-      <element name="USPrice"    type="decimal"/>
-      <element ref="ipo:comment" minOccurs="0"/>
-      <element name="shipDate"   type="date" minOccurs="0"/>
-     </sequence>
-     <attribute name="partNum" type="ipo:SKU" use="required"/>
-    </complexType>
-   </element>
-  </sequence>
- </complexType>
-
- <simpleType name="SKU">
-  <restriction base="string">
-   <pattern value="\d{3}-[A-Z]{2}"/>
-  </restriction>
- </simpleType>
-
-</schema>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xml
deleted file mode 100644
index 98ed6f107..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ex:purchaseReport
-        xmlns:ex="http://www.example.com/Report"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.example.com/Report report.xsd">
-    <ex:regions>
-        <ex:zip code="39487">
-            <ex:part number="293-AX" quantity="3"/>
-            <ex:part number="293-LD" quantity="3"/>
-        </ex:zip>
-        <ex:zip code="29387">
-            <ex:part number="897-JD" quantity="30"/>
-        </ex:zip>
-        <ex:zip code="19285">
-            <ex:part number="123-CK" quantity="19"/>
-            <ex:part number="175-FQ" quantity="8"/>
-        </ex:zip>
-    </ex:regions>
-
-    <ex:parts>
-        <ex:part number="293-AX"/>
-        <ex:part number="897-JD"/>
-        <ex:part number="123-CK"/>
-        <ex:part number="293-LD"/>
-        <ex:part number="175-FQ"/>
-    </ex:parts>
-</ex:purchaseReport>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xsd
deleted file mode 100644
index 0ee7ca4c6..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.com/Report"
- xmlns:r="http://www.example.com/Report"
- xmlns:xipo="http://www.example.com/IPO"
- elementFormDefault="qualified">
-    <annotation>
-        <documentation>
-            The Report Schema from XML Schema Part 0: Primer
-            
-            Copyright 2001, IBM Corp. All Rights Reserved.
-            Copyright 2001, World Wide Web Consortium 
-            (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University).
-            All Rights Reserved.
-        </documentation>
-    </annotation>
-
-    <import namespace="http://www.example.com/IPO" schemaLocation="ipo.xsd"/>
-
-    <element name="purchaseReport">
-        <complexType>
-            <sequence>
-                <element name="regions" type="r:RegionsType"/>
-                   
-                <element name="parts" type="r:PartsType"/>
-            </sequence>
-            <attribute name="period" type="duration"/>
-            <attribute name="periodEnding" type="date"/>
-        </complexType>
-        
-        <unique name="dummy1">
-            <selector xpath="r:regions/r:zip"/>
-            <field xpath="@code"/>
-        </unique>
-        
-        <key name="pNumKey">
-            <selector xpath="r:parts/r:part"/>
-            <field xpath="@number"/>
-        </key>
-        <keyref name="dummy2" refer="r:pNumKey">
-            <selector xpath="r:regions/r:zip/r:part"/>
-            <field xpath="@number"/>
-        </keyref>
-    </element>
-
-    <complexType name="RegionsType">
-        <sequence>
-            <element name="zip" maxOccurs="unbounded">
-                <complexType>
-                    <sequence>
-                        <element name="part" maxOccurs="unbounded">
-                            <complexType>
-                                <complexContent>
-                                    <restriction base="anyType">
-                                        <attribute name="number" type="xipo:SKU"/>
-                                        <attribute name="quantity" type="positiveInteger"/>
-                                    </restriction>
-                                </complexContent>
-                            </complexType>
-                        </element>
-                    </sequence>
-                    <attribute name="code" type="positiveInteger"/>
-                </complexType>
-            </element>
-        </sequence>
-    </complexType>
-
-    <complexType name="PartsType">
-        <sequence>
-            <element name="part" maxOccurs="unbounded">
-                <complexType>
-                    <simpleContent>
-                        <extension base="string">
-                            <attribute name="number" type="xipo:SKU"/>
-                        </extension>
-                    </simpleContent>
-                </complexType>
-            </element>
-        </sequence>
-    </complexType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xml
deleted file mode 100644
index 7d34ce1d4..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ex:purchaseReport
-        xmlns:ex="http://www.example.com/Report"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.example.com/Report">
-    <ex:regions>
-        <ex:zip code="39487">
-            <ex:part number="293-AX" quantity="3"/>
-            <ex:part number="293-LD" quantity="3"/>
-        </ex:zip>
-        <ex:zip code="29387">
-            <ex:part number="897-JD" quantity="30"/>
-        </ex:zip>
-        <ex:zip code="19285">
-            <ex:part number="123-CK" quantity="19"/>
-            <ex:part number="175-FQ" quantity="8"/>
-        </ex:zip>
-    </ex:regions>
-
-    <ex:parts>
-        <ex:part number="293-AX"/>
-        <ex:part number="897-JD"/>
-        <ex:part number="123-CK"/>
-        <ex:part number="293-LD"/>
-        <ex:part number="175-FQ"/>
-    </ex:parts>
-</ex:purchaseReport>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xsd
deleted file mode 100644
index cb284bec2..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/PurchaseOrder/international/report_.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.com/Report"
- xmlns:r="http://www.example.com/Report"
- xmlns:xipo="http://www.example.com/IPO"
- elementFormDefault="qualified">
-    <annotation>
-        <documentation>
-            The Report Schema from XML Schema Part 0: Primer
-            
-            Copyright 2001, IBM Corp. All Rights Reserved.
-            Copyright 2001, World Wide Web Consortium 
-            (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University).
-            All Rights Reserved.
-        </documentation>
-    </annotation>
-
-    <import namespace="http://www.example.com/IPO" schemaLocation="ipo__.xsd"/>
-
-    <element name="purchaseReport">
-        <complexType>
-            <sequence>
-                <element name="regions" type="r:RegionsType"/>
-                   
-                <element name="parts" type="r:PartsType"/>
-            </sequence>
-            <attribute name="period" type="duration"/>
-            <attribute name="periodEnding" type="date"/>
-        </complexType>
-        
-        <unique name="dummy1">
-            <selector xpath="r:regions/r:zip"/>
-            <field xpath="@code"/>
-        </unique>
-        
-        <key name="pNumKey">
-            <selector xpath="r:parts/r:part"/>
-            <field xpath="@number"/>
-        </key>
-        <keyref name="dummy2" refer="r:pNumKey">
-            <selector xpath="r:regions/r:zip/r:part"/>
-            <field xpath="@number"/>
-        </keyref>
-    </element>
-
-    <complexType name="RegionsType">
-        <sequence>
-            <element name="zip" maxOccurs="unbounded">
-                <complexType>
-                    <sequence>
-                        <element name="part" maxOccurs="unbounded">
-                            <complexType>
-                                <complexContent>
-                                    <restriction base="anyType">
-                                        <attribute name="number" type="xipo:SKU"/>
-                                        <attribute name="quantity" type="positiveInteger"/>
-                                    </restriction>
-                                </complexContent>
-                            </complexType>
-                        </element>
-                    </sequence>
-                    <attribute name="code" type="positiveInteger"/>
-                </complexType>
-            </element>
-        </sequence>
-    </complexType>
-
-    <complexType name="PartsType">
-        <sequence>
-            <element name="part" maxOccurs="unbounded">
-                <complexType>
-                    <simpleContent>
-                        <extension base="string">
-                            <attribute name="number" type="xipo:SKU"/>
-                        </extension>
-                    </simpleContent>
-                </complexType>
-            </element>
-        </sequence>
-    </complexType>
-</schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog.xsd
deleted file mode 100644
index b00c82c66..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog.xsd
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:er="http://oasis.names.tc.entity.xmlns.xml.catalog"
-           targetNamespace="http://oasis.names.tc.entity.xmlns.xml.catalog"
-           elementFormDefault="qualified">
-
-  <!-- $Id: catalog.xsd,v 1.1 2005/06/24 04:17:50 csalter Exp $ -->
-
-  <xs:simpleType name="pubIdChars">
-    <!-- A string of the characters defined as pubIdChar in production 13
-         of the Second Edition of the XML 1.0 Recommendation. Does not include
-         the whitespace characters because they're normalized by XML parsing. -->
-    <xs:restriction base="xs:string">
-      <xs:pattern value="[a\-zA\-Z0\-9\-'()+,./:=?;!*#@$_%]*"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name='publicIdentifier'>
-    <xs:restriction base="er:pubIdChars"/>
-  </xs:simpleType>
-
-  <xs:simpleType name='partialPublicIdentifier'>
-    <xs:restriction base='er:pubIdChars'/>
-  </xs:simpleType>
-
-  <xs:simpleType name='systemOrPublic'>
-    <xs:restriction base='xs:string'>
-      <xs:enumeration value='system'/>
-      <xs:enumeration value='public'/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <!-- The global attribute xml:base is not explicitly declared; -->
-  <!-- it is allowed by the anyAttribute declarations. -->
-
-  <xs:complexType name='catalog'>
-    <xs:choice minOccurs='1' maxOccurs='unbounded'>
-      <xs:element ref='er:public'/>
-      <xs:element ref='er:system'/>
-      <xs:element ref='er:uri'/>
-      <xs:element ref='er:rewriteSystem'/>
-      <xs:element ref='er:rewriteURI'/>
-      <xs:element ref='er:delegatePublic'/>
-      <xs:element ref='er:delegateSystem'/>
-      <xs:element ref='er:delegateURI'/>
-      <xs:element ref='er:nextCatalog'/>
-      <xs:element ref='er:group'/>
-      <xs:any namespace='##other' processContents='skip'/>
-    </xs:choice>
-    <xs:attribute name='id' type='xs:ID'/>
-    <xs:attribute name='prefer' type='er:systemOrPublic'/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-
-  <xs:complexType name='public'>
-    <xs:complexContent>
-      <xs:restriction base="xs:anyType">
-        <xs:attribute name="publicId" type="er:publicIdentifier"
-                       use="required"/>
-        <xs:attribute name="uri" type="xs:anyURI" use="required"/>
-        <xs:attribute name='id' type='xs:ID'/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name='system'>
-    <xs:complexContent>
-      <xs:restriction base="xs:anyType">
-        <xs:attribute name="systemId" type="xs:string"
-                       use="required"/>
-        <xs:attribute name="uri" type="xs:anyURI" use="required"/>
-        <xs:attribute name='id' type='xs:ID'/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name='uri'>
-    <xs:complexContent>
-      <xs:restriction base="xs:anyType">
-        <xs:attribute name="name" type="xs:anyURI"
-                       use="required"/>
-        <xs:attribute name="uri" type="xs:anyURI" use="required"/>
-        <xs:attribute name='id' type='xs:ID'/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name='rewriteSystem'>
-    <xs:complexContent>
-      <xs:restriction base="xs:anyType">
-        <xs:attribute name="systemIdStartString"
-                       type="xs:string"
-                       use="required"/>
-        <xs:attribute name="rewritePrefix" type="xs:string" use="required"/>
-        <xs:attribute name='id' type='xs:ID'/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name='rewriteURI'>
-    <xs:complexContent>
-      <xs:restriction base="xs:anyType">
-        <xs:attribute name="uriIdStartString"
-                       type="xs:string"
-                       use="required"/>
-        <xs:attribute name="rewritePrefix" type="xs:string" use="required"/>
-        <xs:attribute name='id' type='xs:ID'/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name='delegatePublic'>
-    <xs:complexContent>
-      <xs:restriction base="xs:anyType">
-        <xs:attribute name="publicIdStartString"
-                       type="er:partialPublicIdentifier"
-                       use="required"/>
-        <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
-        <xs:attribute name='id' type='xs:ID'/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name='delegateSystem'>
-    <xs:complexContent>
-      <xs:restriction base="xs:anyType">
-        <xs:attribute name="systemIdStartString"
-                       type="xs:string"
-                       use="required"/>
-        <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
-        <xs:attribute name='id' type='xs:ID'/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name='delegateURI'>
-    <xs:complexContent>
-      <xs:restriction base="xs:anyType">
-        <xs:attribute name="uriStartString"
-                       type="xs:string"
-                       use="required"/>
-        <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
-        <xs:attribute name='id' type='xs:ID'/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name='nextCatalog'>
-    <xs:complexContent>
-      <xs:restriction base="xs:anyType">
-        <xs:attribute name="catalog" type="xs:anyURI" use="required"/>
-        <xs:attribute name='id' type='xs:ID'/>
-        <xs:anyAttribute namespace="##other" processContents="lax"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name='group'>
-    <xs:choice minOccurs='1' maxOccurs='unbounded'>
-      <xs:element ref='er:public'/>
-      <xs:element ref='er:system'/>
-      <xs:element ref='er:uri'/>
-      <xs:element ref='er:rewriteSystem'/>
-      <xs:element ref='er:rewriteURI'/>
-      <xs:element ref='er:delegatePublic'/>
-      <xs:element ref='er:delegateSystem'/>
-      <xs:element ref='er:delegateURI'/>
-      <xs:element ref='er:nextCatalog'/>
-      <xs:any namespace='##other' processContents='skip'/>
-    </xs:choice>
-    <xs:attribute name='prefer' type='er:systemOrPublic'/>
-    <xs:attribute name='id' type='xs:ID'/>
-    <xs:anyAttribute namespace="##other" processContents="lax"/>
-  </xs:complexType>
-
-  <xs:element name="catalog" type="er:catalog"/>
-  <xs:element name="public" type="er:public"/>
-  <xs:element name="system" type="er:system"/>
-  <xs:element name="uri" type="er:uri"/>
-  <xs:element name="rewriteSystem" type="er:rewriteSystem"/>
-  <xs:element name="rewriteURI" type="er:rewriteURI"/>
-  <xs:element name="delegatePublic" type="er:delegatePublic"/>
-  <xs:element name="delegateSystem" type="er:delegateSystem"/>
-  <xs:element name="delegateURI" type="er:delegateURI"/>
-  <xs:element name="nextCatalog" type="er:nextCatalog"/>
-  <xs:element name="group" type="er:group"/>
-
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog1.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog1.xml
deleted file mode 100644
index 124bc14ae..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <public publicId="InvoiceId_test" uri="./Invoice/Invoice.dtd" webURL="http://webURL"/>
-  <system systemId="Invoice.dtd" uri="./Invoice/Invoice.dtd" chached="yes" property="value1"/>
-  <uri name="http://www.test.com/Invoice.dtd" uri="./Invoice/Invoice.dtd" chached="no" property="value2"/>
-  <nextCatalog catalog="catalog2.xml" id="nextCatalog1"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2.xml
deleted file mode 100644
index 4eca03c3e..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <public publicId="http://www.eclipse.org/webtools/Catalogue_001" uri="./PublicationCatalog/Catalogue.xsd" /> 
-  <system systemId="Catalogue.xsd" uri="./PublicationCatalog/Catalogue.xsd" /> 
-  <uri name="http://www.eclipse.org/webtools/Catalogue.xsd" uri="http://www.eclipse.org/webtools/Catalogue/Catalogue.xsd" /> 
-  <group id="group1" prefer="system">
-    <public publicId="http://www.eclipse.org/webtools/Catalogue_002" uri="./PublicationCatalog/Catalogue.xsd" /> 
-  </group>
-  </catalog>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2bak.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2bak.xml
deleted file mode 100644
index b0a5b23e5..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/catalog2bak.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <public publicId="http://www.eclipse.org/webtools/Catalogue" uri="./PublicationCatalog/Catalogue.xsd"/>
-  <system systemId="Catalogue.xsd" uri="./PublicationCatalog/Catalogue.xsd"/>
-   <group id="group1" prefer="system">
- 		<uri name="http://Catalogue.xsd" uri="http://www.eclipse.org/webtools/Catalogue/Catalogue.xsd"/>
-   </group>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/compatabilityTest.xmlcatalog b/tests/org.eclipse.wst.xml.catalog.tests/data/compatabilityTest.xmlcatalog
deleted file mode 100644
index a8845519e..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/compatabilityTest.xmlcatalog
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<XMLCatalogSettings>
-  <UserEntries>
-    <UserEntry TYPE="PUBLIC" ID="InvoiceId" 
-URI="platform:/resource/XMLExamples/Invoice2/Invoice.dtd"/>
-  </UserEntries>
-</XMLCatalogSettings>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog.xml
deleted file mode 100644
index 7c794c5b1..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/delegateAndRewrite/catalog.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook XML" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
-  <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
-  <delegatePublic publicIdStartString="ISO 8879:1986" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
-  <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
-  <delegateURI uriStartString="http://www.oasis-open.org/docbook/" catalog="file:///usr/share/sgml/docbook/xmlcatalog"/>
-  <rewriteSystem systemIdStartString="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" rewritePrefix="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
-  <rewriteURI uriStartString="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" rewritePrefix="/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/docbook/xmlcatalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/docbook/xmlcatalog.xml
deleted file mode 100644
index d283dee57..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/docbook/xmlcatalog.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <public publicId="ISO 8879:1986//ENTITIES Publishing//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-pub.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk1.ent"/>
-  <public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbpoolx.mod"/>
-  <public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-box.ent"/>
-  <public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/docbookx.dtd"/>
-  <public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk3.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsn.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-num.ent"/>
-  <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbcentx.mod"/>
-  <public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk4.ent"/>
-  <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbnotnx.mod"/>
-  <public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-dia.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-grk2.ent"/>
-  <public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbgenent.mod"/>
-  <public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/dbhierx.mod"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsa.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amso.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-cyrl.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES General Technical//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-tech.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsc.ent"/>
-  <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" uri="xml-dtd-4.2-1.0-17.2/soextblx.dtd"/>
-  <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" uri="xml-dtd-4.1.2-1.0-17.2/calstblx.dtd"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-lat1.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsb.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-lat2.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-amsr.ent"/>
-  <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" uri="xml-dtd-4.2-1.0-17.2/ent/iso-cyr2.ent"/>
-  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1.2" rewritePrefix="xml-dtd-4.1.2-1.0-17.2"/>
-  <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.1.2" rewritePrefix="xml-dtd-4.1.2-1.0-17.2"/>
-  <public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbpoolx.mod"/>
-  <public publicId="-//OASIS//DTD DocBook XML V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/docbookx.dtd"/>
-  <public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbcentx.mod"/>
-  <public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbnotnx.mod"/>
-  <public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbgenent.mod"/>
-  <public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/dbhierx.mod"/>
-  <public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.2//EN" uri="xml-dtd-4.2-1.0-17.2/calstblx.dtd"/>
-  <rewriteSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2" rewritePrefix="xml-dtd-4.2-1.0-17.2"/>
-  <rewriteURI uriStartString="http://www.oasis-open.org/docbook/xml/4.2" rewritePrefix="xml-dtd-4.2-1.0-17.2"/>
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog.xml
deleted file mode 100644
index a67cd07ec..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
-         prefer="public">
- <uri name="http://apache.org/xml/xcatalog/example" uri="./example/example.xsd"/>  
- <system systemId="myexample.xsd" uri="./example/example-nonamespace.xsd"/>    
-    
- <delegatePublic publicIdStartString="-//A//"
-                 catalog="example-catalog2.xml"/>
-
-                   
-</catalog>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog2.xml
deleted file mode 100644
index 18bb1ef85..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example-catalog2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
-         prefer="public">
- <public publicId="-//A//XML CATALOG IDENTIFIER//EN" 
-         uri="./example/example.ent"/>
-</catalog>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-dtd.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-dtd.xml
deleted file mode 100644
index 94aaae9c8..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-dtd.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE root [
- <!ENTITY text PUBLIC "-//A//XML CATALOG IDENTIFIER//EN" 
-  "urn:publicid:-:A:XML+CATALOG+IDENTIFIER:EN">
-]>
-<root>&text;</root>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-nonamespace.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-nonamespace.xsd
deleted file mode 100644
index ef2998d4d..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-nonamespace.xsd
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="root" type="xs:anyURI"/>
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema-nonamespace.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema-nonamespace.xml
deleted file mode 100644
index 39175f1b5..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema-nonamespace.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xsi:noNamespaceSchemaLocation="myexample.xsd">
-http://apache.org/xml/anyURI</root>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema.xml
deleted file mode 100644
index f97cb3bcd..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example-schema.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<root  xmlns="http://apache.org/xml/xcatalog/example">
-http://apache.org/xml/anyURI</root>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.ent b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.ent
deleted file mode 100644
index cd0875583..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.ent
+++ /dev/null
@@ -1 +0,0 @@
-Hello world!
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.xsd
deleted file mode 100644
index 41a29fe22..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/example/example.xsd
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns="http://apache.org/xml/xcatalog/example"
-           targetNamespace="http://apache.org/xml/xcatalog/example">
- <xs:element name="root" type="xs:anyURI"/>
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_mappedincluded.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_mappedincluded.xml
deleted file mode 100644
index bf127b10d..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_mappedincluded.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
-	prefer="public">
-	
-	<uri name="http://www.example.com/Report"
-		uri="./PurchaseOrder/international/report_.xsd" />
-    <!-- we can not map PublicId or URI of the included/redefined schemas -->	
-	<uri name="http://www.example.com/IPO"
-		uri="./PurchaseOrder/international/ipo_.xsd" />
-	<system systemId="address_.xsd"
-		uri="./PurchaseOrder/international/address.xsd" />
-
-</catalog>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_public.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_public.xml
deleted file mode 100644
index 734ecba88..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_public.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
-	prefer="public">
-	
-	<uri name="http://www.example.com/Report"
-		uri="./PurchaseOrder/international/report_.xsd" />
-    <!-- we can not map PublicId or URI of the included/redefined schemas -->	
-	<uri name="http://www.example.com/IPO"
-		uri="./PurchaseOrder/international/ipo.xsd" />
-	
-
-
-</catalog>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_system.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_system.xml
deleted file mode 100644
index c66a1b914..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/report-catalog_system.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE catalog
- PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
- "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
-	<uri name="http://www.example.com/Report"
-		uri="./PurchaseOrder/international/report_.xsd" />
-	<system systemId="ipo__.xsd"
-		uri="./PurchaseOrder/international/ipo_.xsd" />
-	<system systemId="address_.xsd"
-		uri="./PurchaseOrder/international/address.xsd" />
-
-</catalog>
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/schemas.jar b/tests/org.eclipse.wst.xml.catalog.tests/data/schemas.jar
deleted file mode 100644
index 9d1e4da47..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/schemas.jar
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/catalog.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/catalog.xml
deleted file mode 100644
index 98b04a1f0..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/catalog.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" xml:base=".">
-   		<public publicId="myquote" uri="quote2.xml"/>  
-</catalog>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote1.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote1.xml
deleted file mode 100644
index 1fcba5243..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-  <!-- I belong to:
-       org.apache.tools.ant.types.XMLCatalogBuildFileTest.java 
-       -->
-
-<para>
-  A stitch in time saves nine
-</para>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote2.xml
deleted file mode 100644
index 10cd14e2d..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/quote2.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<para>
-  No news is good news
-</para>
-
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog.xsl b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog.xsl
deleted file mode 100644
index e692b0e7a..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog.xsl
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  version="1.0">
-
-  <xsl:output method="text"/>
-
-  <!-- name of the output parameter to write -->
-  <xsl:param name="outprop">value</xsl:param>
-
-  <xsl:strip-space elements="*"/>
-
-  <xsl:template match="/">
-    <xsl:value-of select="$outprop"/>: <xsl:apply-templates select="/fragment/para"/>
-  </xsl:template>
-
-  <!-- This will only be matched in doc2.xml -->
-  <xsl:template match="Ref">
-    <xsl:apply-templates select="document(@file)/fragment/para"/>
-  </xsl:template>
-
-  <!-- This will only be matched in doc1.xml -->
-  <xsl:template match="text()">
-    <xsl:value-of select="normalize-space(.)"/>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog1.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog1.xml
deleted file mode 100644
index 11c730d06..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE fragment [
-  <!ENTITY quote PUBLIC "myquote" "quote1.xml">
-]>
-
-<fragment>
-  <para>
-      &quote;
-  </para>
-</fragment>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml
deleted file mode 100644
index dd41d0b14..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<fragment>
-  <para>
-    <Ref file="xmlcatalog1.xml"/>
-  </para>
-</fragment>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out
deleted file mode 100644
index e9d7fc5ab..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out
+++ /dev/null
@@ -1 +0,0 @@
-testvalue: A stitch in time saves nine
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out-diff b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out-diff
deleted file mode 100644
index 987a5db2b..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-out-diff
+++ /dev/null
@@ -1,2 +0,0 @@
-<<<< testvalue: A stitch in time saves nine
-<<<< testvalue: No news is good news
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-result b/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-result
deleted file mode 100644
index 1de28a704..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/testXSLTwithCatalogResolver/xmlcatalog2.xml-result
+++ /dev/null
@@ -1 +0,0 @@
-testvalue: No news is good news
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/XSLSchema.xsd b/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/XSLSchema.xsd
deleted file mode 100644
index e99645aee..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/data/xsd/XSLSchema.xsd
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/XSL/Transform">
-	<!-- xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd" /-->
-
-	<xsd:element name="stylesheet" type="wrapper" />
-	<xsd:element name="transform" type="wrapper" />
-
-	<xsd:complexType name="wrapper">
-		<xsd:group ref="topLevelElements" minOccurs="0" maxOccurs="unbounded" />
-		<xsd:attribute name="extension-element-prefixes" type="xsd:string" use="optional" />
-		<xsd:attribute name="exclude-result-prefixes" type="xsd:string" use="optional" />
-		<xsd:attribute name="id" type="xsd:ID" use="optional" />
-		<xsd:attribute name="version" type="xsd:NMTOKEN" use="optional" />
-		<!--  xsd:attribute ref="xml:space" /-->
-	</xsd:complexType>
-
-	<xsd:element name="import">
-		<xsd:complexType>
-			<xsd:attribute name="href" type="xsd:anyURI" use="required" />
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="include">
-		<xsd:complexType>
-			<xsd:attribute name="href" type="xsd:anyURI" use="required" />
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="strip-space">
-		<xsd:complexType>
-			<xsd:attribute name="elements" type="xsd:string" use="required" />
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="preserve-space">
-		<xsd:complexType>
-			<xsd:attribute name="elements" type="xsd:string" use="required" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="output">
-		<xsd:complexType>
-			<xsd:attribute name="method" use="optional">
-				<xsd:simpleType>
-					<xsd:restriction base="xsd:string">
-						<xsd:enumeration value="xml" />
-						<xsd:enumeration value="html" />
-						<xsd:enumeration value="text" />
-					</xsd:restriction>
-				</xsd:simpleType>
-			</xsd:attribute>
-			<xsd:attribute name="version" type="xsd:NMTOKEN" use="optional" />
-			<xsd:attribute name="encoding" type="xsd:NMTOKEN" use="optional" />
-			<xsd:attribute name="omit-xml-declaration" use="optional" type="YesNoType" />
-			<xsd:attribute name="standalone" use="optional" type="YesNoType" />
-			<xsd:attribute name="doctype-public" type="xsd:string" use="optional" />
-			<xsd:attribute name="doctype-system" type="xsd:string" use="optional" />
-			<xsd:attribute name="cdata-section-elements" type="xsd:NMTOKENS" use="optional" />
-			<xsd:attribute name="indent" use="optional" type="YesNoType" />
-			<xsd:attribute name="media-type" type="xsd:string" use="optional" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="key">
-		<xsd:complexType>
-			<xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
-			<xsd:attribute name="match" type="pattern" use="required" />
-			<xsd:attribute name="use" type="expression" use="required" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="decimal-format">
-		<xsd:complexType>
-			<xsd:attribute name="name" type="xsd:NMTOKEN" use="optional" />
-			<xsd:attribute default="." name="decimal-separator" type="xsd:string" />
-			<xsd:attribute default="," name="grouping-separator" type="xsd:string" />
-			<xsd:attribute default="Infinity" name="infinity" type="xsd:string" />
-			<xsd:attribute default="-" name="minus-sign" type="xsd:string" />
-			<xsd:attribute default="NaN" name="NaN" type="xsd:string" />
-			<xsd:attribute default="%" name="percent" type="xsd:string" />
-			<xsd:attribute default="‰" name="per-mille" type="xsd:string" />
-			<xsd:attribute default="0" name="zero-digit" type="xsd:string" />
-			<xsd:attribute default="#" name="digit" type="xsd:string" />
-			<xsd:attribute default=";" name="pattern-separator" type="xsd:string" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="namespace-alias">
-		<xsd:complexType>
-			<xsd:attribute name="stylesheet-prefix" type="xsd:string" use="required" />
-			<xsd:attribute name="result-prefix" type="xsd:string" use="required" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="template">
-		<xsd:complexType mixed="true">
-			<xsd:sequence>
-				<xsd:element ref="param" minOccurs="0" maxOccurs="unbounded" />
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:group ref="char-instructions"></xsd:group>
-					<xsd:any namespace="##other" processContents="skip" />
-				</xsd:choice>
-			</xsd:sequence>
-			<xsd:attribute name="match" type="pattern" use="optional" />
-			<xsd:attribute name="name" type="xsd:NMTOKEN" use="optional" />
-			<xsd:attribute name="priority" type="xsd:NMTOKEN" use="optional" />
-			<xsd:attribute name="mode" type="xsd:NMTOKEN" use="optional" />
-			<!--  xsd:attribute ref="xml:space" /-->
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="value-of">
-		<xsd:complexType>
-			<xsd:attributeGroup ref="select-required" />
-			<xsd:attributeGroup ref="disable-output-escaping" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="copy-of">
-		<xsd:complexType>
-			<xsd:attributeGroup ref="select-required" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="number">
-		<xsd:complexType>
-			<xsd:attribute default="single" name="level">
-				<xsd:simpleType>
-					<xsd:restriction base="xsd:string">
-						<xsd:enumeration value="single" />
-						<xsd:enumeration value="multiple" />
-						<xsd:enumeration value="any" />
-					</xsd:restriction>
-				</xsd:simpleType>
-			</xsd:attribute>
-	        <xsd:attribute name="count" type="pattern" use="optional"/>
-		    <xsd:attribute name="from" type="pattern" use="optional"/>
-		    <xsd:attribute name="value" type="expression" use="optional"/>
-			<xsd:attribute default="1" name="format" type="xsd:string" />
-			<xsd:attribute name="lang" type="xsd:string" use="optional" />
-			<xsd:attribute name="letter-value" type="xsd:string" use="optional" />
-			<xsd:attribute name="grouping-separator" type="xsd:string" use="optional" />
-			<xsd:attribute name="grouping-size" type="xsd:string" use="optional" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="apply-templates">
-		<xsd:complexType>
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:element ref="sort" />
-				<xsd:element ref="with-param" />
-			</xsd:choice>
-			<xsd:attribute default="node()" name="select" type="expression" />
-			<xsd:attribute name="mode" type="xsd:NMTOKEN" use="optional" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="apply-imports">
-		<xsd:complexType />
-	</xsd:element>
-
-	<xsd:element name="for-each">
-		<xsd:complexType mixed="true">
-			<xsd:sequence>
-				<xsd:element ref="sort" minOccurs="0" maxOccurs="unbounded" />
-				<xsd:choice minOccurs="0" maxOccurs="unbounded">
-					<xsd:group ref="char-instructions"></xsd:group>
-					<xsd:any namespace="##other" processContents="skip" />
-				</xsd:choice>
-			</xsd:sequence>
-			<xsd:attributeGroup ref="select-required" />
-			<!--  xsd:attribute ref="xml:space" /-->
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="sort">
-		<xsd:complexType>
-			<xsd:attribute default="." name="select" type="expression" />
-			<xsd:attribute name="lang" type="xsd:string" use="optional" />
-			<xsd:attribute default="text" name="data-type" type="xsd:string" />
-			<xsd:attribute default="ascending" name="order" type="xsd:string" />
-			<xsd:attribute name="case-order" type="xsd:string" use="optional" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="if">
-		<xsd:complexType mixed="true">
-			<xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded"></xsd:group>
-			<xsd:attribute name="test" type="expression" use="required" />
-			<!--  xsd:attribute ref="xml:space" /-->
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="choose">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element ref="when" minOccurs="1" maxOccurs="unbounded" />
-				<xsd:element ref="otherwise" minOccurs="0" />
-			</xsd:sequence>
-			<!--  xsd:attribute ref="xml:space" /-->
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="when">
-		<xsd:complexType mixed="true">
-			<xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded" />
-			<xsd:attribute name="test" type="expression" use="required" />
-			<!--  xsd:attribute ref="xml:space" /-->
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="otherwise">
-		<xsd:complexType mixed="true">
-			<xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded" />
-			<!--  xsd:attribute ref="xml:space" /-->
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="attribute-set">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element  ref="attribute"  minOccurs="0" maxOccurs="unbounded" />
-			</xsd:sequence>
-			<xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
-			<xsd:attribute name="use-attribute-sets" type="xsd:NMTOKENS" use="optional" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="call-template">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element ref="with-param" minOccurs="0"  maxOccurs="unbounded"  />
-			</xsd:sequence>
-			<xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="with-param" type="NamedAndSelectable" />
-	
-	<xsd:element name="variable" type="NamedAndSelectable" />
-	
-	<xsd:element name="param" type="NamedAndSelectable" />
-	
-	<xsd:element name="text">
-		<xsd:complexType>
-			<xsd:simpleContent>
-				<xsd:extension base="xsd:string">
-					<xsd:attributeGroup ref="disable-output-escaping" />
-				</xsd:extension>
-			</xsd:simpleContent>
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="processing-instruction">
-		<xsd:complexType mixed="true">
-			<xsd:group ref="char-instructions"></xsd:group>
-			<xsd:attribute name="name" type="xsd:string" use="required" />
-			<!--  xsd:attribute ref="xml:space" /-->
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="element">
-		<xsd:complexType mixed="true">
-			<xsd:group ref="instructions"></xsd:group>
-			<xsd:attribute name="name" type="xsd:string" use="required" />
-			<xsd:attribute name="namespace" type="xsd:string" use="optional" />
-			<xsd:attributeGroup ref="use-attribute-sets" />
-			<!--  xsd:attribute ref="xml:space" /-->
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="attribute">
-		<xsd:complexType mixed="true">
-			<xsd:group ref="char-instructions"/>
-			<xsd:attribute name="name" type="xsd:string" use="required" />
-			<xsd:attribute name="namespace" type="xsd:string" use="optional" />
-			<!--  xsd:attribute ref="xml:space" /-->
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="comment">
-		<xsd:complexType mixed="true">
-			<xsd:group ref="char-instructions"/>
-			<!--  xsd:attribute ref="xml:space" /-->
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="copy">
-		<xsd:complexType mixed="true">
-			<xsd:group ref="instructions"/>
-			<!--  xsd:attribute ref="xml:space" /-->
-			<xsd:attributeGroup ref="use-attribute-sets" />
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="message">
-		<xsd:complexType mixed="true">
-			<xsd:group ref="char-instructions"/>
-			<xsd:attribute default="no" name="terminate" type="YesNoType" />
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:element name="fallback">
-		<xsd:complexType mixed="true">
-			<xsd:choice maxOccurs="unbounded" minOccurs="0">
-				<xsd:group ref="instructions"></xsd:group>
-			</xsd:choice>
-			<!--  xsd:attribute ref="xml:space" /-->
-		</xsd:complexType>
-	</xsd:element>
-
-	<xsd:group name="instructions">
-		<xsd:choice>
-			<xsd:group ref="char-instructions"></xsd:group>
-			<xsd:element ref="processing-instruction" />
-			<xsd:element ref="comment" />
-			<xsd:element ref="element" />
-			<xsd:element ref="attribute" />
-		</xsd:choice>
-	</xsd:group>
-
-	<xsd:group name="char-instructions">
-		<xsd:choice>
-			<xsd:element ref="apply-templates" />
-			<xsd:element ref="call-template" />
-			<xsd:element ref="apply-imports" />
-			<xsd:element ref="for-each" />
-			<xsd:element ref="value-of" />
-			<xsd:element ref="copy-of" />
-			<xsd:element ref="number" />
-			<xsd:element ref="choose" />
-			<xsd:element ref="if" />
-			<xsd:element ref="text" />
-			<xsd:element ref="copy" />
-			<xsd:element ref="variable" />
-			<xsd:element ref="message" />
-			<xsd:element ref="fallback" />
-		</xsd:choice>
-	</xsd:group>
-
-	<xsd:group name="topLevelElements">
-		<xsd:choice>
-			<xsd:element ref="import" />
-			<xsd:element ref="include" />
-			<xsd:element ref="strip-space" />
-			<xsd:element ref="preserve-space" />
-			<xsd:element ref="key" />
-			<xsd:element ref="decimal-format" />
-			<xsd:element ref="attribute-set" />
-			<xsd:element ref="namespace-alias" />
-			<xsd:element ref="param" />
-			<xsd:element ref="variable" />
-			<xsd:element ref="output" />
-			<xsd:element ref="template" />
-		</xsd:choice>
-	</xsd:group>
-
-	<xsd:simpleType name="YesNoType">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="yes" />
-			<xsd:enumeration value="no" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:complexType name="NamedAndSelectable" mixed="true">
-		<xsd:group ref="instructions" minOccurs="0" maxOccurs="unbounded" />
-		<xsd:attribute name="name" type="xsd:NMTOKEN" use="required" />
-		<xsd:attributeGroup ref="select-optional" />
-	</xsd:complexType>
-
-
-	<xsd:simpleType name="expression">
-		<xsd:restriction base="xsd:string"></xsd:restriction>
-	</xsd:simpleType>
-	<xsd:simpleType name="pattern">
-		<xsd:restriction base="xsd:string"></xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:attributeGroup name="select-optional">
-		<xsd:attribute name="select" type="expression" />
-	</xsd:attributeGroup>
-	<xsd:attributeGroup name="select-required">
-		<xsd:attribute name="select" type="expression" use="required" />
-	</xsd:attributeGroup>
-	<xsd:attributeGroup name="disable-output-escaping">
-		<xsd:attribute name="disable-output-escaping" type="YesNoType" default="no" />
-	</xsd:attributeGroup>
-	<xsd:attributeGroup name="use-attribute-sets">
-		<xsd:attribute name="use-attribute-sets" type="xsd:NMTOKENS" use="optional"/>
-	</xsd:attributeGroup>
-
-</xsd:schema>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/plugin.xml b/tests/org.eclipse.wst.xml.catalog.tests/plugin.xml
deleted file mode 100644
index ca8ffe88d..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    	<extension point="org.eclipse.wst.xml.core.catalogContributions">
-	  <catalogContribution> 
-           <system id="testSystemId"
-               systemId="http://personal/personal.dtd"
-               uri="data/Personal/personal.dtd"> 
-               </system>
-           <public id="testPublicId1"
-               publicId="InvoiceId_test"
-               uri="data/Invoice/Invoice.dtd"
-               webURL="http://org.eclipse.wst.xml.example/Invoice.dtd">
-          </public>
-          <uri id="testUriId1"
-               name="http://apache.org/xml/xcatalog/example" 
-               uri="data/example/example.xsd"/> 
-          <uri id="testURIId2"
-               name="http://www.w3.org/2001/XMLSchema"
-               uri="platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd">
-          </uri> 
-           <uri id="testURIId3"
-               name="http://oasis.names.tc.entity.xmlns.xml.catalog"
-               uri="jar:platform:/plugin/org.eclipse.wst.xml.catalog.tests/data/schemas.jar!/data/catalog.xsd">
-          </uri> 
-          <nextCatalog id="testNestedCatalog"
-               catalog="data/catalog1.xml"/> 
-       </catalogContribution> 
-	</extension> 
-   
- 
-</plugin>
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AbstractCatalogTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AbstractCatalogTest.java
deleted file mode 100644
index b045822f4..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AbstractCatalogTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogContributorRegistryReader;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogSet;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.osgi.framework.Bundle;
-
-public abstract class AbstractCatalogTest extends TestCase
-{
-    private CatalogSet catalogSet = new CatalogSet();
-    
-    protected ICatalog systemCatalog;
-
-    protected ICatalog userCatalog;
-
-    protected ICatalog defaultCatalog;
-    
-    
-    public AbstractCatalogTest(String name)
-    {
-        super(name);
-        
-    }
-
-    protected static List getCatalogEntries(ICatalog catalog, int entryType)
-    {
-        List result = new ArrayList();
-        ICatalogEntry[] entries = catalog.getCatalogEntries();
-        for (int i = 0; i < entries.length; i++)
-        {
-            ICatalogEntry entry = entries[i];
-            if (entry.getEntryType() == entryType)
-            {
-                result.add(entry);
-            }
-        }
-        return result;
-    }
-    
-    protected ICatalog getCatalog(String id, String uriString) throws Exception
-    {
-		return catalogSet.lookupOrCreateCatalog(id, uriString);
-    }
-    
-
-    public void initCatalogs()
-    {
-        defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-        INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
-        for (int i = 0; i < nextCatalogs.length; i++)
-        {
-            INextCatalog catalog = nextCatalogs[i];
-            ICatalog referencedCatalog = catalog.getReferencedCatalog();
-            if (referencedCatalog != null)
-            {
-                if (XMLCorePlugin.SYSTEM_CATALOG_ID
-                        .equals(referencedCatalog.getId()))
-                {
-                    systemCatalog = referencedCatalog;
-                } else if (XMLCorePlugin.USER_CATALOG_ID
-                        .equals(referencedCatalog.getId()))
-                {
-                    userCatalog = referencedCatalog;
-                }
-            }
-        }
-    }
-
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-        initCatalogs();
-    }
-	
-	protected static String makeAbsolute(String baseLocation, String location)
-	  {
-		  URL local = null;
-		  location = location.replace('\\', '/');
-		  try
-		  {
-			  URL baseURL = new URL(baseLocation);
-			  local = new URL(baseURL, location);
-		  } catch (MalformedURLException e)
-		  {
-		  }
-		  
-		  if (local != null)
-		  {
-			  return local.toString();
-		  } else
-		  {
-			  return location;
-		  }
-	  }
-	
-	protected static URL resolvePluginLocation(String pluginId){
-		Bundle bundle = Platform.getBundle(pluginId);
-		if (bundle != null)
-		{
-			URL bundleEntry = bundle.getEntry("/");
-			try
-			{
-				return Platform.resolve(bundleEntry);
-			} catch (IOException e)
-			{
-				e.printStackTrace();
-			}
-		}
-		return null;
-	}
-	
-	// see CatalogContributorRegistryReader.resolvePath(String path) 
-	  protected String resolvePath(String pluginId, String path) 
-	  {
-
-		  return  CatalogContributorRegistryReader.resolvePath( 
-				  CatalogContributorRegistryReader.getPlatformURL(pluginId), path);
-	  }
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AllTests.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AllTests.java
deleted file mode 100644
index 8c4bd78d6..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/AllTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Test for org.eclipse.wst.xml.catalog.tests");
-		//$JUnit-BEGIN$
-		suite.addTestSuite(CatalogReaderTest.class);
-		suite.addTestSuite(CatalogResolverTest.class);
-		suite.addTestSuite(CatalogWriterTest.class);
-		suite.addTestSuite(CatalogContributorRegistryReaderTest.class);
-		suite.addTestSuite(CatalogTest.class);
-		//$JUnit-END$
-		return suite;
-	}
-    
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogContributorRegistryReaderTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogContributorRegistryReaderTest.java
deleted file mode 100644
index e5c80f771..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogContributorRegistryReaderTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-
-
-public class CatalogContributorRegistryReaderTest extends AbstractCatalogTest
-{
-    protected void setUp() throws Exception
-    {
-        super.setUp();
-    }
-
-    protected void tearDown() throws Exception
-    {
-        super.tearDown();
-    }
-
-    public CatalogContributorRegistryReaderTest(String name)
-    {
-        super(name);
-    }
-
-    public final void testReadRegistry() throws Exception
-    {
-        assertNotNull(defaultCatalog);
-        assertEquals(XMLCorePlugin.DEFAULT_CATALOG_ID, defaultCatalog.getId());
-        assertEquals(2, defaultCatalog.getNextCatalogs().length);
-
-		String pluginId = TestPlugin.getDefault().getBundle().getSymbolicName();
-    
-		  // test system entries
-        assertNotNull(systemCatalog);
-        List entries = CatalogTest.getCatalogEntries(systemCatalog, ICatalogEntry.ENTRY_TYPE_SYSTEM);
-		for (int i = 0; i < entries.size(); i++)
-		{
-			ICatalogEntry entry = (ICatalogEntry)entries.get(i);
-			if("testSystemId".equals(entry.getId()))
-			{
-				String resolvedURI = resolvePath(pluginId, "data/Personal/personal.dtd");
-				assertEquals(resolvedURI, entry.getURI());
-				assertEquals("http://personal/personal.dtd", entry.getKey());
-			}
-		}
-		
-		// test public entries
-        entries = CatalogTest.getCatalogEntries(systemCatalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);      
-		for (int i = 0; i < entries.size(); i++)
-		{
-			ICatalogEntry entry = (ICatalogEntry)entries.get(i);
-			if("testPublicId1".equals(entry.getId()))
-			{
-				String resolvedURI = resolvePath(pluginId, "data/Invoice/Invoice.dtd");
-				assertEquals(resolvedURI, entry.getURI());
-				assertEquals("InvoiceId_test", entry.getKey());
-				// test user defined attributes
-				assertEquals("http://org.eclipse.wst.xml.example/Invoice.dtd", entry.getAttributeValue("webURL"));
-
-			}
-			
-			else if("testMappingInfo".equals(entry.getId()))
-			{
-				String resolvedURI = resolvePath(pluginId, "platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd");
-				assertEquals(resolvedURI, entry.getURI());
-				assertEquals("http://www.w3.org/2001/XMLSchema1", entry.getKey());
-			}
-	     
-		}
-      
-        // test uri entries
-        entries = CatalogTest.getCatalogEntries(systemCatalog, ICatalogEntry.ENTRY_TYPE_URI);
-		for (int i = 0; i < entries.size(); i++)
-		{
-			ICatalogEntry entry = (ICatalogEntry)entries.get(i);
-			if("testURIId1".equals(entry.getId()))
-			{
-				  String resolvedURI = resolvePath(pluginId, "data/example/example.xsd");
-			      assertEquals(resolvedURI, entry.getURI());
-			      assertEquals("http://apache.org/xml/xcatalog/example", entry.getKey());
-			}
-			else if("testURIId2".equals(entry.getId()))
-			{
-				String resolvedURI = resolvePath(pluginId, "platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd");
-				assertEquals(resolvedURI, entry.getURI());
-				assertEquals("http://www.w3.org/2001/XMLSchema", entry.getKey());
-			}
-			else if("testURIId3".equals(entry.getId()))
-			{
-				String resolvedURI = resolvePath(pluginId, "jar:platform:/plugin/org.eclipse.wst.xml.catalog.tests/data/schemas.jar!/data/catalog.xsd");
-				assertEquals(resolvedURI, entry.getURI());
-				assertEquals("http://oasis.names.tc.entity.xmlns.xml.catalog", entry.getKey());
-			}
-		}
-      
-        // test tested catalog
-        INextCatalog[] nextCatalogEntries = systemCatalog.getNextCatalogs();
-        for (int i = 0; i < nextCatalogEntries.length; i++)
-		{
-			INextCatalog nextCatalogEntry = (INextCatalog) nextCatalogEntries[i];
-			if("testNestedCatalog".equals(nextCatalogEntry.getId()))
-			{
-				String resolvedURI = resolvePath(pluginId, "data/catalog1.xml");
-				assertEquals(resolvedURI, nextCatalogEntry.getCatalogLocation());
-				ICatalog nextCatalog = nextCatalogEntry.getReferencedCatalog();
-				assertNotNull(nextCatalog);
-				assertEquals(3, nextCatalog.getCatalogEntries().length);
-				// test public entries
-				entries = CatalogTest.getCatalogEntries(nextCatalog,
-						ICatalogEntry.ENTRY_TYPE_PUBLIC);
-				assertEquals(1, entries.size());
-				ICatalogEntry entry = (ICatalogEntry) entries.get(0);
-				//URI uri = URIHelper.getURIForFilePath(resolvedURI);
-				//resolvedURI = URIHelper.makeAbsolute(uri.toURL(), "./Invoice/Invoice.dtd");
-				assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-				assertEquals("InvoiceId_test", entry.getKey());
-				// test system entries
-				entries = CatalogTest.getCatalogEntries(nextCatalog,
-						ICatalogEntry.ENTRY_TYPE_SYSTEM);
-				assertEquals(1, entries.size());
-				entry = (ICatalogEntry) entries.get(0);
-				assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-				assertEquals("Invoice.dtd", entry.getKey());
-				// test uri entries
-				entries = CatalogTest.getCatalogEntries(nextCatalog,
-						ICatalogEntry.ENTRY_TYPE_URI);
-				assertEquals(1, entries.size());
-				entry = (ICatalogEntry) entries.get(0);
-				assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-				assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
-			}
-		}
-    }
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java
deleted file mode 100644
index 079355e87..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogReaderTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-
-public class CatalogReaderTest extends AbstractCatalogTest {
-
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public CatalogReaderTest(String name) {
-		super(name);
-	}
-
-
-	/*
-	 * Class under test for void read(ICatalog, String)
-	 */
-	public void testReadCatalog()throws Exception {
-
-		//read catalog
-		String catalogFile = "/data/catalog1.xml";
-		URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
-		assertNotNull(catalogUrl);
-		URL base = Platform.resolve(catalogUrl);
-
-		Catalog catalog = (Catalog)getCatalog("catalog1", base.toString());
-		//CatalogReader.read(catalog, catalogFilePath);
-		assertNotNull(catalog);
-		
-		// test main catalog - catalog1.xml
-		//assertEquals("cat1", catalog.getId());
-		assertEquals(3, catalog.getCatalogEntries().length);
-			
-		// test public entries
-		List entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
-		assertEquals(1, entries.size());
-		ICatalogEntry entry = (ICatalogEntry)entries.get(0);
-		//String resolvedURI = URIHelper.makeAbsolute(base, "./Invoice/Invoice.dtd");
-		
-		assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-		assertEquals("InvoiceId_test", entry.getKey());
-		assertEquals("http://webURL", entry.getAttributeValue("webURL"));
-
-		
-		//  test system entries
-		entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_SYSTEM);
-		assertEquals(1, entries.size());
-		entry = (ICatalogEntry)entries.get(0);
-		assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-		assertEquals("Invoice.dtd", entry.getKey());
-		assertEquals("yes", entry.getAttributeValue("chached"));
-		assertEquals("value1", entry.getAttributeValue("property"));
-
-
-		//  test uri entries
-		entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_URI);
-		assertEquals(1, entries.size());
-		entry = (ICatalogEntry)entries.get(0);
-		assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-		assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
-		assertEquals("no", entry.getAttributeValue("chached"));
-		assertEquals("value2", entry.getAttributeValue("property"));
-		
-		//  test next catalog - catalog2.xml
-		INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
-		assertEquals(1, nextCatalogEntries.length);
-	
-		INextCatalog nextCatalogEntry = (INextCatalog)nextCatalogEntries[0];
-		assertNotNull(nextCatalogEntry);
-		
-//		String catalogRefId = nextCatalogEntry.getCatalogRefId();
-//		assertEquals("nextCatalog1", catalogRefId);
-		//resolvedURI = URIHelper.makeAbsolute(base, "catalog2.xml");
-		assertEquals("catalog2.xml", nextCatalogEntry.getCatalogLocation());
-
-		ICatalog nextCatalog = nextCatalogEntry.getReferencedCatalog();
-
-		assertNotNull(nextCatalog);
-		assertEquals(4, nextCatalog.getCatalogEntries().length);
-		
-		// test public entries
-		entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
-		assertEquals(2, entries.size());
-		entry = (ICatalogEntry)entries.get(0);
-		//resolvedURI = URIHelper.makeAbsolute(nextCatalog.getBase(), "./PublicationCatalog/Catalogue.xsd");
-		assertEquals("./PublicationCatalog/Catalogue.xsd", entry.getURI());
-		assertEquals("http://www.eclipse.org/webtools/Catalogue_001", entry.getKey());
-		
-		// test public entry from a group
-		entry = (ICatalogEntry)entries.get(1);
-		//resolvedURI = URIHelper.makeAbsolute(nextCatalog.getBase(), "./PublicationCatalog/Catalogue.xsd");
-		assertEquals("./PublicationCatalog/Catalogue.xsd", entry.getURI());
-		assertEquals("http://www.eclipse.org/webtools/Catalogue_002", entry.getKey());
-
-		//  test system entries
-		entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_SYSTEM);
-		assertEquals(1, entries.size());
-		entry = (ICatalogEntry)entries.get(0);
-		assertEquals("./PublicationCatalog/Catalogue.xsd", entry.getURI());
-		assertEquals("Catalogue.xsd", entry.getKey());
-		//  test uri entries
-		entries = CatalogTest.getCatalogEntries(nextCatalog, ICatalogEntry.ENTRY_TYPE_URI);
-		assertEquals(1, entries.size());
-		entry = (ICatalogEntry)entries.get(0);
-		assertEquals("http://www.eclipse.org/webtools/Catalogue/Catalogue.xsd", entry.getURI());
-		assertEquals("http://www.eclipse.org/webtools/Catalogue.xsd", entry.getKey());
-		
-
-	}
-	
-	public void testCompatabilityReader() throws Exception {
-		//	read catalog
-		String catalogFile = "/data/compatabilityTest.xmlcatalog";
-		URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(catalogFile);
-		assertNotNull(catalogUrl);
-		URL base = Platform.resolve(catalogUrl);
-
-		Catalog catalog = (Catalog)getCatalog("compatabilityCatalog", base.toString());
-		//CatalogReader.read(catalog, catalogFilePath);
-		assertNotNull(catalog);
-		List entries = CatalogTest.getCatalogEntries(catalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
-		assertEquals(1, entries.size());
-		ICatalogEntry entry = (ICatalogEntry)entries.get(0);
-		assertEquals("platform:/resource/XMLExamples/Invoice2/Invoice.dtd", entry.getURI());
-		assertEquals("InvoiceId", entry.getKey());
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogResolverTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogResolverTest.java
deleted file mode 100644
index 222cbb7e0..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogResolverTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-
-public class CatalogResolverTest extends AbstractCatalogTest {
-
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public CatalogResolverTest(String name) {
-		super(name);
-	}
-
-	public final void testResolveResolver() throws Exception {
-	
-	
-		// from plugin.xml file
-		String pluginBase = resolvePluginLocation(TestPlugin.getDefault().getBundle().getSymbolicName()).toString();
-
-		String resolvedActual = defaultCatalog.resolvePublic("InvoiceId_test", null);
-		String resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
-		assertEquals(resolvedURI, resolvedActual);
-		resolvedActual = defaultCatalog.resolveSystem("http://personal/personal.dtd");
-		resolvedURI = makeAbsolute(pluginBase, "data/Personal/personal.dtd");
-		assertEquals(resolvedURI, resolvedActual);
-		resolvedActual = defaultCatalog.resolveURI("http://apache.org/xml/xcatalog/example");
-		resolvedURI = makeAbsolute(pluginBase, "data/example/example.xsd");
-		assertEquals(resolvedURI, resolvedActual);
-		resolvedActual = defaultCatalog.resolveURI("http://www.w3.org/2001/XMLSchema");
-		resolvedURI = resolvePath("", "platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd");
-		resolvedURI = makeAbsolute(pluginBase, resolvedURI);
-		assertEquals(resolvedURI, resolvedActual);
-		
-		// from catalog1.xml
-		resolvedActual = defaultCatalog.resolvePublic("InvoiceId_test", null);
-		resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
-		assertEquals(resolvedURI, resolvedActual);
-
-		resolvedActual = defaultCatalog.resolveSystem("Invoice.dtd");
-		resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
-		assertEquals(resolvedURI, resolvedActual);
-
-		resolvedActual = defaultCatalog.resolveURI("http://www.test.com/Invoice.dtd");
-		resolvedURI = makeAbsolute(pluginBase, "data/Invoice/Invoice.dtd");
-		assertEquals(resolvedURI, resolvedActual);
-
-		
-		// from catalog2.xml
-		resolvedActual = defaultCatalog.resolvePublic("http://www.eclipse.org/webtools/Catalogue_001", null);
-		resolvedURI = makeAbsolute(pluginBase, "data/PublicationCatalog/Catalogue.xsd");
-		assertEquals(resolvedURI, resolvedActual);
-		
-		resolvedActual = defaultCatalog.resolvePublic("http://www.eclipse.org/webtools/Catalogue_002", null);
-		resolvedURI = makeAbsolute(pluginBase, "data/PublicationCatalog/Catalogue.xsd");
-		assertEquals(resolvedURI, resolvedActual);
-
-		resolvedActual = defaultCatalog.resolveSystem("Catalogue.xsd");
-		resolvedURI = makeAbsolute(pluginBase, "data/PublicationCatalog/Catalogue.xsd");
-		assertEquals(resolvedURI, resolvedActual);
-
-		resolvedActual = defaultCatalog.resolveURI("http://Catalogue.xsd");
-		resolvedURI = "http://www.eclipse.org/webtools/Catalogue.xsd";
-		assertEquals(resolvedURI, resolvedURI);
-
-
-	}
-
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogTest.java
deleted file mode 100644
index 57ec343dd..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-
-
-
-public class CatalogTest extends AbstractCatalogTest {
-
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public CatalogTest(String name) {
-		super(name);
-	}
-    
-    public void testCatalog() throws Exception
-    {
-       Catalog workingUserCatalog = new Catalog(null, "working", null);
-       assertNotNull(userCatalog);
-       workingUserCatalog.addEntriesFromCatalog(userCatalog);
-       
-       ICatalogEntry catalogEntry = (ICatalogEntry)userCatalog.createCatalogElement(ICatalogEntry.ENTRY_TYPE_PUBLIC);
-       catalogEntry.setKey("testKey");
-       catalogEntry.setURI("http://testuri");
-       workingUserCatalog.addCatalogElement(catalogEntry);
-     
-       userCatalog.addEntriesFromCatalog(workingUserCatalog);
-	   String userCatalogLocation = userCatalog.getLocation();
-	  
-       userCatalog.save();
-       userCatalog.clear();
-       
-       userCatalog = getCatalog(XMLCorePlugin.USER_CATALOG_ID, userCatalogLocation);
-       
-       List entries = getCatalogEntries(userCatalog, ICatalogEntry.ENTRY_TYPE_PUBLIC);
-       assertEquals(1, entries.size());
-       ICatalogEntry entry = (ICatalogEntry)entries.get(0);
-     
-       assertEquals("http://testuri", entry.getURI());
-       assertEquals("testKey", entry.getKey());
-
-   
-    }
-
-
-   
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java
deleted file mode 100644
index cfdab447f..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/CatalogWriterTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-public class CatalogWriterTest extends AbstractCatalogTest {
-
-	protected void setUp() throws Exception {
-		super.setUp();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public CatalogWriterTest(String name) {
-		super(name);
-	}
-
-	public final void testWrite() throws Exception {
-
-		// read catalog
-		String catalogFile = "/data/catalog1.xml";
-		URL catalogUrl = TestPlugin.getDefault().getBundle().getEntry(
-				catalogFile);
-		assertNotNull(catalogUrl);
-		URL resolvedURL = Platform.resolve(catalogUrl);
-
-		Catalog testCatalog = (Catalog) getCatalog("catalog1", resolvedURL
-				.toString());
-		assertNotNull(testCatalog);
-		testCatalog.setBase(resolvedURL.toString());
-		// CatalogReader.read(testCatalog, resolvedURL.getFile());
-		assertNotNull(testCatalog);
-
-		// write catalog
-		URL resultsFolder = TestPlugin.getDefault().getBundle().getEntry(
-				"/");
-		IPath path = new Path(Platform.resolve(resultsFolder).getFile());
-		String resultCatalogFile = path.append("actual_results/catalog1.xml").toFile().toURI().toString();
-		testCatalog.setLocation(resultCatalogFile);
-		// write catalog
-		testCatalog.save();
-		
-		// read catalog file from the saved location and test its content
-		Catalog catalog = (Catalog) getCatalog("catalog2", testCatalog.getLocation());
-		assertNotNull(catalog);
-
-		// test saved catalog - catalog1.xml
-		assertEquals(3, catalog.getCatalogEntries().length);
-
-		// test public entries
-		List entries = CatalogTest.getCatalogEntries(catalog,
-				ICatalogEntry.ENTRY_TYPE_PUBLIC);
-		assertEquals(1, entries.size());
-		ICatalogEntry entry = (ICatalogEntry) entries.get(0);
-
-		assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-		assertEquals("InvoiceId_test", entry.getKey());
-		assertEquals("http://webURL", entry.getAttributeValue("webURL"));
-
-		// test system entries
-		entries = CatalogTest.getCatalogEntries(catalog,
-				ICatalogEntry.ENTRY_TYPE_SYSTEM);
-		assertEquals(1, entries.size());
-		entry = (ICatalogEntry) entries.get(0);
-		assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-		assertEquals("Invoice.dtd", entry.getKey());
-		assertEquals("yes", entry.getAttributeValue("chached"));
-		assertEquals("value1", entry.getAttributeValue("property"));
-
-		// test uri entries
-		entries = CatalogTest.getCatalogEntries(catalog,
-				ICatalogEntry.ENTRY_TYPE_URI);
-		assertEquals(1, entries.size());
-		entry = (ICatalogEntry) entries.get(0);
-		assertEquals("./Invoice/Invoice.dtd", entry.getURI());
-		assertEquals("http://www.test.com/Invoice.dtd", entry.getKey());
-		assertEquals("no", entry.getAttributeValue("chached"));
-		assertEquals("value2", entry.getAttributeValue("property"));
-
-		// test next catalog - catalog2.xml
-		INextCatalog[] nextCatalogEntries = catalog.getNextCatalogs();
-		assertEquals(1, nextCatalogEntries.length);
-
-		INextCatalog nextCatalogEntry = (INextCatalog) nextCatalogEntries[0];
-		assertNotNull(nextCatalogEntry);
-
-		assertEquals("catalog2.xml", nextCatalogEntry.getCatalogLocation());
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/TestPlugin.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/TestPlugin.java
deleted file mode 100644
index 4e42219ff..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/TestPlugin.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestPlugin extends Plugin {
-	//The shared instance.
-	private static TestPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	
-	/**
-	 * The constructor.
-	 */
-	public TestPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static TestPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = TestPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.wst.xml.catalog.test.TestPluginResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-	
-	
-	public static String resolvePluginLocation(String path) throws IOException {
-		URL url = getDefault().getBundle().getEntry(path);
-		url = Platform.resolve(url);
-		return url.getFile();
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/XSDSchemaTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/XSDSchemaTest.java
deleted file mode 100644
index 4bb55b87c..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/XSDSchemaTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-
-import junit.framework.TestCase;
-
-public class XSDSchemaTest extends TestCase {
-
-	public static void main(String[] args) {
-	}
-	
-	public void testSchemaForSchema(){
-		
-		  XSDSchemaImpl.getSchemaForSchema("http://www.w3.org/2001/XMLSchema");  
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/ZipTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/ZipTest.java
deleted file mode 100644
index dca8739f0..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/catalog/tests/internal/ZipTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.wst.xml.catalog.tests.internal;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-public class ZipTest extends TestCase {
-
-	 public void testZip() throws Exception{
-		  
-		  URL url = new URL("jar:file:/D:/tcs/catalogJarTest/schemas.jar!/data/catalog.xsd");
-		  InputStream is = url.openStream();
-    }
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/FileUtil.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/FileUtil.java
deleted file mode 100644
index e5ef8d06c..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/FileUtil.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.eclipse.wst.xml.resolver.tools.tests.internal;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.InputStream;
-import java.io.PrintWriter;
-
-public class FileUtil {
-
-	public FileUtil() {
-		super();
-	}
-	
-	public static void copyFile(String src, String dest) {
-		InputStream is = null;
-		FileOutputStream fos = null;
-		try {
-			is = new FileInputStream(src);
-			fos = new FileOutputStream(dest);
-			int c = 0;
-			byte[] array = new byte[1024];
-			while ((c = is.read(array)) >= 0) {
-				fos.write(array, 0, c);
-			}
-		} catch (Exception e) {
-		} finally {
-			try {
-				fos.close();
-				is.close();
-			} catch (Exception e) {
-			}
-		}
-	}
-	
-	public static File createFileAndParentDirectories(String fileName)
-		throws Exception {
-		File file = new File(fileName);
-		File parent = file.getParentFile();
-		if (!parent.exists()) {
-			parent.mkdirs();
-		}
-		file.createNewFile();
-		return file;
-	}
-	
-	public static void deleteDirectories(File dir)
-		throws Exception {
-
-		File[] children = dir.listFiles();
-		for(int i=0; i< children.length; i++){
-			if(children[i].list() != null && children[i].list().length > 0){
-				deleteDirectories(children[i]);
-			}
-			else{
-				children[i].delete();
-			}
-		}
-		dir.delete();
-			
-	}
-	
-	public static boolean textualCompare(final File first, final File second, File diff) throws java.io.IOException {
-        BufferedReader r1 = new BufferedReader(new FileReader(first));
-        BufferedReader r2 = new BufferedReader(new FileReader(second));
-        PrintWriter printWriter = new PrintWriter(new FileOutputStream(diff));             
-                             
-        boolean diffFound = false;
-        while (r1.ready()) {
-            String s1 = r1.readLine();
-            String s2 = r2.readLine();
-            if (s1 == null) {
-                if (s2 == null)
-                    return diffFound;   // files equal
-                else
-                    diffFound = true;  // files differ in length
-            }
-            if (!s1.equals(s2)) {
-            	printWriter.println("<<<< " + s1);
-            	printWriter.println("<<<< " + s2);
-                diffFound = true;    // files differ
-            }
-        } 
-        
-        printWriter.flush(); 
-        
-        return  diffFound;
-     
-    }
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/ResolvingXMLParser.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/ResolvingXMLParser.java
deleted file mode 100644
index 389d00192..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/ResolvingXMLParser.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.eclipse.wst.xml.resolver.tools.tests.internal;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Vector;
-
-import org.apache.xml.resolver.CatalogManager;
-import org.apache.xml.resolver.apps.XParseError;
-import org.apache.xml.resolver.tools.ResolvingXMLReader;
-
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-
-public class ResolvingXMLParser {
-	
-	public boolean validationError = false;
-
-	protected static int maxErrs = 10;
-
-	protected static boolean nsAware = true;
-
-	protected static boolean validating = true;
-
-	protected static boolean showErrors = true;
-
-	protected static boolean showWarnings = true;
-
-	protected static Vector catalogFiles = new Vector();
-
-	protected  void parseAndValidate(String xmlFile, String[] catalogs)
-			throws MalformedURLException, FileNotFoundException, IOException {
-
-			CatalogManager myManager = new CatalogManager();
-			StringBuffer catalogFile = new StringBuffer();
-			for(int i=0; i<catalogs.length; i++){
-				catalogFile = catalogFile.append(catalogs[i] + ";");
-			}
-			myManager.setCatalogFiles(catalogFile.toString());
-		    myManager.setIgnoreMissingProperties(true);
-		    myManager.setVerbosity(2);
-		    ResolvingXMLReader reader = new ResolvingXMLReader(myManager);
-			try {
-				reader.setFeature("http://xml.org/sax/features/namespaces",
-								nsAware);
-				reader.setFeature("http://xml.org/sax/features/validation",
-						validating);
-				reader.setFeature(
-						"http://apache.org/xml/features/validation/schema", true);
-			} catch (SAXNotRecognizedException e1) {
-				e1.printStackTrace();
-			} catch (SAXNotSupportedException e1) {
-				e1.printStackTrace();
-			}
-
-		XParseError xpe = new XParseError(showErrors, showWarnings);
-		xpe.setMaxMessages(maxErrs);
-		reader.setErrorHandler(xpe);
-
-		String parseType = validating ? "validating" : "well-formed";
-		String nsType = nsAware ? "namespace-aware" : "namespace-ignorant";
-		if (maxErrs > 0) {
-			System.out.println("Attempting " + parseType + ", " + nsType
-					+ " parse");
-		}
-
-		try {
-			reader.parse(xmlFile);
-		} catch (Exception e) {
-			validationError = true;
-			e.printStackTrace();
-		}
-
-		if (maxErrs > 0) {
-			System.out.print("Parse ");
-			if (xpe.getFatalCount() > 0) {
-				validationError = true;
-				System.out.print("failed ");
-			} else {
-				System.out.print("succeeded ");
-				System.out.print("(");
-			}
-			System.out.print("with ");
-
-			int errCount = xpe.getErrorCount();
-			int warnCount = xpe.getWarningCount();
-
-			if (errCount > 0) {
-				validationError = true;
-				System.out.print(errCount + " error");
-				System.out.print(errCount > 1 ? "s" : "");
-				System.out.print(" and ");
-			} else {
-				System.out.print("no errors and ");
-			}
-
-			if (warnCount > 0) {
-				validationError = true;
-				System.out.print(warnCount + " warning");
-				System.out.print(warnCount > 1 ? "s" : "");
-				System.out.print(".");
-			} else {
-				System.out.print("no warnings.");
-			}
-
-			System.out.println("");
-		}
-	}
-	
-	
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/TraXLiaison.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/TraXLiaison.java
deleted file mode 100644
index 46861c2fb..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/TraXLiaison.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-package org.eclipse.wst.xml.resolver.tools.tests.internal;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.XMLReader;
-
-import javax.xml.parsers.SAXParserFactory;
-
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.Templates;
-
-import javax.xml.transform.ErrorListener;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.Source;
-import javax.xml.transform.URIResolver;
-
-import javax.xml.transform.sax.SAXSource;
-
-/**
- * Concrete liaison for XSLT processor implementing TraX. (ie JAXP 1.1)
- *
- * @author <a href="mailto:rubys@us.ibm.com">Sam Ruby</a>
- * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
- * @since Ant 1.3
- */
-public class TraXLiaison implements XSLTLiaison, ErrorListener {
-
-	/** The trax TransformerFactory */
-	private TransformerFactory tfactory = null;
-
-	/** stylesheet stream, close it asap */
-	private FileInputStream xslStream = null;
-
-	/** Stylesheet template */
-	private Templates templates = null;
-
-	/** transformer */
-	private Transformer transformer = null;
-
-	/** possible resolver for publicIds */
-	private EntityResolver entityResolver;
-
-	/** possible resolver for URIs */
-	private URIResolver uriResolver;
-
-	public TraXLiaison() throws Exception {
-		tfactory = TransformerFactory.newInstance();
-		tfactory.setErrorListener(this);
-	}
-
-	/**
-	 * Set the output property for the current transformer.
-	 * Note that the stylesheet must be set prior to calling
-	 * this method.
-	 * @param name the output property name.
-	 * @param value the output property value.
-	 */
-	public void setOutputProperty(String name, String value) {
-		if (transformer == null) {
-			throw new IllegalStateException("stylesheet must be set prior to setting the output properties");
-		}
-		transformer.setOutputProperty(name, value);
-	}
-
-	//------------------- IMPORTANT
-	// 1) Don't use the StreamSource(File) ctor. It won't work with
-	// xalan prior to 2.2 because of systemid bugs.
-
-	// 2) Use a stream so that you can close it yourself quickly
-	// and avoid keeping the handle until the object is garbaged.
-	// (always keep control), otherwise you won't be able to delete
-	// the file quickly on windows.
-
-	// 3) Always set the systemid to the source for imports, includes...
-	// in xsl and xml...
-
-	public void setStylesheet(File stylesheet) throws Exception {
-		xslStream = new FileInputStream(stylesheet);
-		StreamSource src = new StreamSource(xslStream);
-		src.setSystemId(getSystemId(stylesheet));
-		templates = tfactory.newTemplates(src);
-		transformer = templates.newTransformer();
-		transformer.setErrorListener(this);
-	}
-
-	public void transform(File infile, File outfile) throws Exception {
-		FileInputStream fis = null;
-		FileOutputStream fos = null;
-		try {
-			fis = new FileInputStream(infile);
-			fos = new FileOutputStream(outfile);
-			// FIXME: need to use a SAXSource as the source for the transform
-			// so we can plug in our own entity resolver
-			Source src = null;
-			if (entityResolver != null) {
-				if (tfactory.getFeature(SAXSource.FEATURE)) {
-					SAXParserFactory spFactory = SAXParserFactory.newInstance();
-					spFactory.setNamespaceAware(true);
-					XMLReader reader = spFactory.newSAXParser().getXMLReader();
-					reader.setEntityResolver(entityResolver);
-					src = new SAXSource(reader, new InputSource(fis));
-				} else {
-					throw new IllegalStateException(
-						"xcatalog specified, but "
-							+ "parser doesn't support SAX");
-				}
-			} else {
-				src = new StreamSource(fis);
-			}
-			src.setSystemId(getSystemId(infile));
-			StreamResult res = new StreamResult(fos);
-			// not sure what could be the need of this...
-			res.setSystemId(getSystemId(outfile));
-
-			if (uriResolver != null)
-				transformer.setURIResolver(uriResolver);
-
-			transformer.transform(src, res);
-		} finally {
-			// make sure to close all handles, otherwise the garbage
-			// collector will close them...whenever possible and
-			// Windows may complain about not being able to delete files.
-			try {
-				if (xslStream != null) {
-					xslStream.close();
-				}
-			} catch (IOException ignored) {
-			}
-			try {
-				if (fis != null) {
-					fis.close();
-				}
-			} catch (IOException ignored) {
-			}
-			try {
-				if (fos != null) {
-					fos.close();
-				}
-			} catch (IOException ignored) {
-			}
-		}
-	}
-
-	// make sure that the systemid is made of '/' and not '\' otherwise
-	// crimson will complain that it cannot resolve relative entities
-	// because it grabs the base uri via lastIndexOf('/') without
-	// making sure it is really a /'ed path
-	protected String getSystemId(File file) {
-		String path = file.getAbsolutePath();
-		path = path.replace('\\', '/');
-
-		// on Windows, use 'file:///'
-		if (File.separatorChar == '\\') {
-			return FILE_PROTOCOL_PREFIX + "/" + path;
-		}
-		// Unix, use 'file://'
-		return FILE_PROTOCOL_PREFIX + path;
-	}
-
-	public void addParam(String name, String value) {
-		transformer.setParameter(name, value);
-	}
-
-	public void error(TransformerException e) {
-		logError(e, "Error");
-	}
-
-	public void fatalError(TransformerException e) {
-		logError(e, "Fatal Error");
-	}
-
-	public void warning(TransformerException e) {
-		logError(e, "Warning");
-	}
-
-	private void logError(TransformerException e, String type) {
-
-		StringBuffer msg = new StringBuffer();
-		if (e.getLocator() != null) {
-			if (e.getLocator().getSystemId() != null) {
-				String url = e.getLocator().getSystemId();
-				if (url.startsWith("file:///")) {
-					url = url.substring(8);
-				}
-				msg.append(url);
-			} else {
-				msg.append("Unknown file");
-			}
-			if (e.getLocator().getLineNumber() != -1) {
-				msg.append(":" + e.getLocator().getLineNumber());
-				if (e.getLocator().getColumnNumber() != -1) {
-					msg.append(":" + e.getLocator().getColumnNumber());
-				}
-			}
-		}
-		msg.append(": " + type + "! ");
-		msg.append(e.getMessage());
-		if (e.getCause() != null) {
-			msg.append(" Cause: " + e.getCause());
-		}
-
-		System.out.println(msg.toString());
-	}
-
-	/** Set the class to resolve entities during the transformation
-	 */
-	public void setEntityResolver(EntityResolver aResolver) {
-		entityResolver = aResolver;
-	}
-
-	/** Set the class to resolve URIs during the transformation
-	 */
-	public void setURIResolver(URIResolver aResolver) {
-		uriResolver = aResolver;
-		tfactory.setURIResolver(aResolver);
-	}
-
-} //-- TraXLiaison
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/ValidatorTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/ValidatorTest.java
deleted file mode 100644
index 45e7ac970..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/ValidatorTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.eclipse.wst.xml.resolver.tools.tests.internal;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.catalog.tests.internal.TestPlugin;
-
-
-/**
- * To run this test need to add resolver.jar to the classpath.
- * Run as JUnit Plugin test:
- * - put resolver.jar on the boot class path
- * - add VM argument:
- * 
- * -Xbootclasspath/p:<install location>\jre\lib\ext\resolver.jar
- *
- *
- */
-public class ValidatorTest extends TestCase {
-	
-	
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public ValidatorTest(String name) {
-		super(name);
-	}
-	
-	
-	public void testValidatingParser() throws IOException {
-		String xmlFile = "/data/Personal/personal-schema.xml";
-		xmlFile = TestPlugin.resolvePluginLocation(xmlFile);
-		
-		String catalogFile = "/data/catalog2.xml";
-		catalogFile = TestPlugin.resolvePluginLocation(catalogFile);
-				
-		System.out.println("---------" + this.getName() + "---------");
-		ResolvingXMLParser parser = new ResolvingXMLParser();
-		parser.parseAndValidate(xmlFile, new String[]{catalogFile});
-		assertFalse(parser.validationError);
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/XSLTLiaison.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/XSLTLiaison.java
deleted file mode 100644
index 7bf36a890..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/XSLTLiaison.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-package org.eclipse.wst.xml.resolver.tools.tests.internal;
-
-import java.io.File;
-
-/**
- * Proxy interface for XSLT processors.
- *
- * @author <a href="mailto:rubys@us.ibm.com">Sam Ruby</a>
- * @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
- * @see XSLTProcess
- * @since Ant 1.1
- */
-public interface XSLTLiaison {
-
-    /**
-     * the file protocol prefix for systemid.
-     * This file protocol must be appended to an absolute path.
-     * Typically: <tt>FILE_PROTOCOL_PREFIX + file.getAbsolutePath()</tt>
-     * Note that on Windows, an extra '/' must be appended to the
-     * protocol prefix so that there is always 3 consecutive slashes.
-     * @since Ant 1.4
-     */
-    String FILE_PROTOCOL_PREFIX = "file://";
-
-    /**
-     * set the stylesheet to use for the transformation.
-     * @param stylesheet the stylesheet to be used for transformation.
-     * @since Ant 1.4
-     */
-    void setStylesheet(File stylesheet) throws Exception;
-
-    /**
-     * Add a parameter to be set during the XSL transformation.
-     * @param name the parameter name.
-     * @param expression the parameter value as an expression string.
-     * @throws Exception thrown if any problems happens.
-     * @since Ant 1.3
-     */
-    void addParam(String name, String expression) throws Exception;
-
-    /**
-     * Perform the transformation of a file into another.
-     * @param infile the input file, probably an XML one. :-)
-     * @param outfile the output file resulting from the transformation
-     * @throws Exception thrown if any problems happens.
-     * @see #setStylesheet(File)
-     * @since Ant 1.4
-     */
-    void transform(File infile, File outfile) throws Exception;
-
-} //-- XSLTLiaison
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/XSLTWithCatalogResolverTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/XSLTWithCatalogResolverTest.java
deleted file mode 100644
index 4cfb3addc..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/resolver/tools/tests/internal/XSLTWithCatalogResolverTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.eclipse.wst.xml.resolver.tools.tests.internal;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.apache.xml.resolver.tools.CatalogResolver;
-import org.eclipse.wst.xml.catalog.tests.internal.TestPlugin;
-
-
-/**
- * Test from http://issues.apache.org/bugzilla/show_bug.cgi?id=16336
- * 
- * To run this test need to add resolver.jar to the classpath.
- * Run as JUnit Plugin test:
- * - put resolver.jar on the boot class path
- * - add VM argument:
- * 
- * -Xbootclasspath/p:<install location>\jre\lib\ext\resolver.jar
- *
- *
- */
-public class XSLTWithCatalogResolverTest extends TestCase {
-
-	CatalogResolver catalogResolver = null;
-	TraXLiaison xsltLiason = null;
-	static String SEP = File.separator;
-
-	public XSLTWithCatalogResolverTest(String name) {
-		super(name);
-	}
-
-	public static void main(String[] args) {
-		junit.textui.TestRunner.run(XSLTWithCatalogResolverTest.class);
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();	
-		catalogResolver = new CatalogResolver();
-		xsltLiason = new TraXLiaison();
-		xsltLiason.setEntityResolver(catalogResolver);
-		xsltLiason.setURIResolver(catalogResolver);
-
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public void testXSLTwithCatalogResolver() throws Exception {
-		
-		String testDirName = "data/testXSLTwithCatalogResolver";
-		testDirName = TestPlugin.resolvePluginLocation(testDirName);
-		
-		String catalogFileName = testDirName + SEP + "catalog.xml";	
-		String xslFileName = testDirName + SEP + "xmlcatalog.xsl";
-		String xmlFileName = testDirName + SEP + "xmlcatalog2.xml";
-		String resultFileName = xmlFileName + "-out";
-		String idealResultFileName = xmlFileName + "-result";
-
-		//setup catalog 
-
-		File catalogFile = new File(catalogFileName);
-		
-		assertTrue("Catalog file " + catalogFileName + " should exist for the test", catalogFile.exists());
-	
-		catalogResolver.getCatalog().parseCatalog(catalogFileName);
-		
-		File xslFile = new File(xslFileName);
-		
-		assertTrue("XSL file " + xslFileName + " should exist for the test", xslFile.exists());		
-			
-		File inFile = new File(xmlFileName);
-		
-		assertTrue("XML file " + xslFileName + " should exist for the test", xslFile.exists());		
-		
-		File outFile = FileUtil.createFileAndParentDirectories(resultFileName);
-
-		xsltLiason.setStylesheet(xslFile);
-		xsltLiason.addParam("outprop", "testvalue");
-	
-		xsltLiason.transform(inFile, outFile);
-		
-		boolean diffFound =
-					FileUtil.textualCompare(
-						outFile,
-						new File(idealResultFileName),
-						new File(resultFileName + "-diff"));
-			
-	   assertTrue("Output file should match the expected results", !diffFound);
-
-		
-
-	}
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/MyXMLCatalogResolver.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/MyXMLCatalogResolver.java
deleted file mode 100644
index d0f123ed6..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/MyXMLCatalogResolver.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.wst.xml.uriresolver.validation.tests.internal;
-
-import java.io.IOException;
-
-import org.apache.xerces.util.XMLCatalogResolver;
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-
-public class MyXMLCatalogResolver extends XMLCatalogResolver {
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public String resolveIdentifier(XMLResourceIdentifier resourceIdentifier) throws IOException, XNIException {
-	    String resolvedId = null;
-
-        // The namespace is useful for resolving namespace aware
-        // grammars such as XML schema. Let it take precedence over
-        // the external identifier if one exists.
-        String namespace = resourceIdentifier.getNamespace();
-        if (namespace != null) {
-            resolvedId = resolveURI(namespace);
-        }
-        
-        // Resolve against an external identifier if one exists. This
-        // is useful for resolving DTD external subsets and other 
-        // external entities. For XML schemas if there was no namespace 
-        // mapping we might be able to resolve a system identifier 
-        // specified as a location hint.
-        if (resolvedId == null) {
-            String publicId = resourceIdentifier.getPublicId();
-            String systemId = getUseLiteralSystemId() 
-                ? resourceIdentifier.getLiteralSystemId()
-                : resourceIdentifier.getExpandedSystemId();
-            if (publicId != null && systemId != null) {
-                resolvedId = resolvePublic(publicId, systemId);
-            }
-            else if (systemId != null) {
-                resolvedId = resolveSystem(systemId);
-            }
-        }
-        return resolvedId;
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/Validator.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/Validator.java
deleted file mode 100644
index b46539391..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/Validator.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.eclipse.wst.xml.uriresolver.validation.tests.internal;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.xerces.parsers.DOMParser;
-import org.apache.xerces.parsers.SAXParser;
-import org.apache.xerces.util.XMLCatalogResolver;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class Validator {
-	
-	public boolean validationError = false;
-	
-	public void validateWithSchema_JAXP(String xmlFile, String[] catalogs) {
-		try {
-			System.setProperty("javax.xml.parsers.DocumentBuilderFactory",
-					"org.apache.xerces.jaxp.DocumentBuilderFactoryImpl");
-			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-			factory.setNamespaceAware(true);
-			factory.setValidating(true);
-			factory.setAttribute(
-					"http://java.sun.com/xml/jaxp/properties/schemaLanguage",
-					"http://www.w3.org/2001/XMLSchema");
-	
-			// Create catalog resolver and set a catalog list.
-			XMLCatalogResolver resolver = new XMLCatalogResolver();
-			resolver.setPreferPublic(true);
-			resolver.setCatalogList(catalogs);
-			factory.setAttribute(
-					  "http://apache.org/xml/properties/internal/entity-resolver", 
-					  resolver);
-
-			DocumentBuilder builder = factory.newDocumentBuilder();
-			ErrorHandler handler = new ErrorHandler(this);
-			builder.setErrorHandler(handler);
-			builder.setEntityResolver(resolver);
-			builder.parse(xmlFile);
-			
-			if (validationError == true)
-				System.out.println("XML Document has Error: "
-						+ handler.saxParseException.getMessage());
-			else
-				System.out.println("XML Document is valid");
-		} catch (java.io.IOException ioe) {
-			System.out.println("IOException " + ioe.getMessage());
-		} catch (SAXException e) {
-			System.out.println("SAXException " + e.getMessage());
-		} catch (ParserConfigurationException e) {
-			System.out.println("ParserConfigurationException                    "
-							+ e.getMessage());
-		}
-		
-	}
-
-	
-	public void validateWithSchema_XercesSAXParser(String XmlDocumentUrl, String [] catalogs) {
-		SAXParser parser = new SAXParser();
-		try {
-			parser.setFeature("http://xml.org/sax/features/validation", true);
-			parser.setFeature(
-					"http://apache.org/xml/features/validation/schema", true);
-			
-			//	Create catalog resolver and set a catalog list.
-			XMLCatalogResolver resolver = new XMLCatalogResolver();
-			resolver.setUseLiteralSystemId(true);
-			resolver.setPreferPublic(true);
-			resolver.setCatalogList(catalogs);
-			
-			//	Set the resolver on the parser.
-			parser.setProperty("http://apache.org/xml/properties/internal/entity-resolver", 
-					  resolver);
-
-			ErrorHandler handler = new ErrorHandler(this);
-			parser.setErrorHandler(handler);
-			
-			parser.parse(XmlDocumentUrl);
-			if (validationError == true){
-				System.out.println("XML Document has Error: "
-						+ handler.saxParseException.getMessage());
-				throw  handler.saxParseException;
-			}
-			else{
-				System.out.println("XML Document is valid");
-			}
-				
-		} catch (java.io.IOException ioe) {
-			System.out.println("IOException " + ioe.getMessage());
-		} catch (SAXException e) {
-			System.out.println("SAXException " + e.getMessage());
-		}
-	}
-	
-	public void validateWithSchema_XercesDOMParser(String XmlDocumentUrl, String [] catalogs) {
-		DOMParser parser = new DOMParser();
-		try {
-			parser.setFeature("http://xml.org/sax/features/validation", true);
-			parser.setFeature(
-					"http://apache.org/xml/features/validation/schema", true);
-			
-			//	Create catalog resolver and set a catalog list.
-			XMLCatalogResolver resolver = new XMLCatalogResolver();
-			resolver.setUseLiteralSystemId(true);
-			resolver.setPreferPublic(true);
-			resolver.setCatalogList(catalogs);
-			
-			//	Set the resolver on the parser.
-			parser.setProperty("http://apache.org/xml/properties/internal/entity-resolver", 
-					  resolver);
-
-			ErrorHandler handler = new ErrorHandler(this);
-			parser.setErrorHandler(handler);
-			
-			parser.parse(XmlDocumentUrl);
-			if (validationError == true){
-				System.out.println("XML Document has Error: "
-						+ handler.saxParseException.getMessage());
-				throw  handler.saxParseException;
-			}
-			else{
-				System.out.println("XML Document is valid");
-			}
-				
-		} catch (java.io.IOException ioe) {
-			System.out.println("IOException " + ioe.getMessage());
-		} catch (SAXException e) {
-			System.out.println("SAXException " + e.getMessage());
-		}
-	}
-
-	private class ErrorHandler extends DefaultHandler {
-
-		Validator validator;
-
-		public SAXParseException saxParseException = null;
-
-		public ErrorHandler(Validator validator) {
-			super();
-			this.validator = validator;
-		}
-
-		public void error(SAXParseException exception) throws SAXException {
-			validationError = true;
-			saxParseException = exception;
-		}
-
-		public void fatalError(SAXParseException exception) throws SAXException {
-			validationError = true;
-			saxParseException = exception;
-		}
-
-		public void warning(SAXParseException exception) throws SAXException {
-		}
-	}
-
-	
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/ValidatorTest.java b/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/ValidatorTest.java
deleted file mode 100644
index 6b84cafbb..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/src/org/eclipse/wst/xml/uriresolver/validation/tests/internal/ValidatorTest.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.eclipse.wst.xml.uriresolver.validation.tests.internal;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.catalog.tests.internal.TestPlugin;
-
-/**
- * To run this test need to add resolver.jar to the classpath.
- * Run as JUnit Plugin test:
- * - put resolver.jar on the boot class path
- * - add VM argument:
- * 
- * -Xbootclasspath/p:<install location>\jre\lib\ext\resolver.jar
- *
- *
- */
-public class ValidatorTest extends TestCase {
-	
-	Validator validator = null;
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		validator = new Validator();
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-	}
-
-	public ValidatorTest(String name) {
-		super(name);
-	}
-	
-	
-	public void testValidatingXercesSAXParser1() throws IOException {
-		String xmlFile = "/data/Personal/personal-schema.xml";
-		xmlFile = TestPlugin.resolvePluginLocation(xmlFile);
-		
-		String catalogFile = "/data/catalog2.xml";
-		catalogFile = TestPlugin.resolvePluginLocation(catalogFile);
-		
-		System.out.println("---------" + this.getName() + "---------");
-		validator.validateWithSchema_XercesSAXParser(xmlFile, new String[]{catalogFile});
-		assertFalse(validator.validationError);
-	}
-	
-	public void testValidatingXercesSAXParser2() throws IOException {
-		String xmlFile = "/data/example/example-schema.xml";
-		xmlFile = TestPlugin.resolvePluginLocation(xmlFile);
-		
-		String catalogFile = "/data/example-catalog.xml";
-		catalogFile = TestPlugin.resolvePluginLocation(catalogFile);
-		
-		System.out.println("---------" + this.getName() + "---------");
-		validator.validateWithSchema_XercesSAXParser(xmlFile, new String[]{catalogFile});
-		assertFalse(validator.validationError);
-	}
-	public void testValiatingXercesSAXParser3() throws IOException {
-		String xmlFile = "/data/example/example-schema-nonamespace.xml";
-		xmlFile = TestPlugin.resolvePluginLocation(xmlFile);
-		
-		String catalogFile = "/data/example-catalog.xml";
-		catalogFile = TestPlugin.resolvePluginLocation(catalogFile);
-		
-		System.out.println("---------" + this.getName() + "---------");
-		validator.validateWithSchema_XercesSAXParser(xmlFile, new String[]{catalogFile});
-		assertFalse(validator.validationError);
-	}
-	
-	public void testValidatingXercesDOMParser1() throws IOException {
-		String xmlFile = "/data/example/example-schema-nonamespace.xml";
-		xmlFile = TestPlugin.resolvePluginLocation(xmlFile);
-		
-		String catalogFile = "/data/example-catalog.xml";
-		catalogFile = TestPlugin.resolvePluginLocation(catalogFile);
-		
-		System.out.println("---------" + this.getName() + "---------");
-		validator.validateWithSchema_XercesDOMParser(xmlFile, new String[]{catalogFile});
-		assertFalse(validator.validationError);
-	}
-	
-	public void testValidatingJAXPParser1() throws IOException {
-		String xmlFile = "/data/example/example-schema.xml";
-		xmlFile = TestPlugin.resolvePluginLocation(xmlFile);
-		
-		String catalogFile = "/data/example-catalog.xml";
-		catalogFile = TestPlugin.resolvePluginLocation(catalogFile);
-		
-		System.out.println("---------" + this.getName() + "---------");
-		validator.validateWithSchema_JAXP(xmlFile, new String[]{catalogFile});	
-		assertFalse(validator.validationError);
-	}
-	
-	public void testValidationWithImportedAndIncludedSchema1() throws IOException {
-		String xmlFile = "/data/PurchaseOrder/international/report_.xml";
-		xmlFile = TestPlugin.resolvePluginLocation(xmlFile);
-		
-		String catalogFile = "/data/report-catalog_system.xml";
-		catalogFile = TestPlugin.resolvePluginLocation(catalogFile);
-		
-		System.out.println("---------" + this.getName() + "---------");
-		validator.validateWithSchema_XercesDOMParser(xmlFile, new String[]{catalogFile});
-		// Included schema will be resolved
-		assertFalse(validator.validationError);
-	}
-	
-	public void testValidationWithImportedAndIncludedSchema2() throws IOException {
-		String xmlFile = "/data/PurchaseOrder/international/report_.xml";
-		xmlFile = TestPlugin.resolvePluginLocation(xmlFile);
-		
-		String catalogFile = "/data/report-catalog_public.xml";
-		catalogFile = TestPlugin.resolvePluginLocation(catalogFile);
-		
-		System.out.println("---------" + this.getName() + "---------");
-		validator.validateWithSchema_XercesDOMParser(xmlFile, new String[]{catalogFile});
-		// Included schema will not be resolved
-		assertTrue(validator.validationError);
-	}
-	
-	public void testValidationWithImportedAndIncludedSchema3() throws IOException {
-		String xmlFile = "/data/PurchaseOrder/international/report_.xml";
-		xmlFile = TestPlugin.resolvePluginLocation(xmlFile);
-		
-		String catalogFile = "/data/report-catalog_mappedincluded.xml";
-		catalogFile = TestPlugin.resolvePluginLocation(catalogFile);
-		
-		System.out.println("---------" + this.getName() + "---------");
-		validator.validateWithSchema_XercesDOMParser(xmlFile, new String[]{catalogFile});
-		// Included schema will not be resolved
-		assertTrue(validator.validationError);
-	}
-	
-	public void testValidationWithImportedSchemaNoCatalog() throws IOException {
-		String xmlFile = "/data/PurchaseOrder/international/report.xml";
-		xmlFile = TestPlugin.resolvePluginLocation(xmlFile);
-		
-		String catalogFile = "";
-		
-		System.out.println("---------" + this.getName() + "---------");
-		validator.validateWithSchema_XercesDOMParser(xmlFile, new String[]{catalogFile});
-		assertFalse(validator.validationError);
-	}
-	
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.catalog.tests/test.xml b/tests/org.eclipse.wst.xml.catalog.tests/test.xml
deleted file mode 100644
index 4b384c18d..000000000
--- a/tests/org.eclipse.wst.xml.catalog.tests/test.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
-
-  <!-- Configurable Properties -->
-
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="plugin-name" value="org.eclipse.wst.xml.catalog.tests"/>
-
-  <!-- End Configurable Properties -->
-
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- Set a meaningful default value for when it is not. -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
-  <property name="bvtworkspace" value="${basedir}"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
-  <property name="workspace-folder" value="${bvtworkspace}/${plugin-name}"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-     <delete>
-       <fileset dir="${eclipse-home}" includes="org.eclipse.wst.xml.catalog.tests.*.xml"/>
-    </delete>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite">
-
-    <!-- Start with clean data workspace -->  
-    <delete dir="${workspace-folder}" quiet="true"/>
-
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${workspace-folder}"/>
-      <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.wst.xml.catalog.tests.internal.AllTests"/>
-    </ant>
-
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after -->
-  <!-- after all of the tests have been run. You can use this target to -->
-  <!-- delete temporary files that have been created. -->
-  <target name="cleanup">
-    <delete dir="${workspace-folder}" quiet="true"/>
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen -->
-  <!-- after all the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org.eclipse.wst.xml.catalog.tests*.xml"/>
-      <property name="output-file" value="${plugin-name}.xml"/>
-    </ant>
-  </target>
-
-</project>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.classpath b/tests/org.eclipse.wst.xml.core.tests/.classpath
deleted file mode 100644
index a99584684..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.cvsignore b/tests/org.eclipse.wst.xml.core.tests/.cvsignore
deleted file mode 100644
index fd4ea5ef3..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-ssemodelxmltests.jar
diff --git a/tests/org.eclipse.wst.xml.core.tests/.project b/tests/org.eclipse.wst.xml.core.tests/.project
deleted file mode 100644
index 89ffba5bd..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.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.xml.core.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c9135..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec575022..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5f7bac712..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Aug 19 16:31:43 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7adde..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c5e..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bba7..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 2e6a1feae..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.xml.core.tests; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-ClassPath: ssemodelxmltests.jar
-Bundle-Activator: org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.core.internal.document.test;x-internal:=true,
- org.eclipse.wst.xml.core.tests,
- org.eclipse.wst.xml.core.tests.contentmodel,
- org.eclipse.wst.xml.core.tests.document,
- org.eclipse.wst.xml.core.tests.dom,
- org.eclipse.wst.xml.core.tests.format,
- org.eclipse.wst.xml.core.tests.format.testfiles.xml,
- org.eclipse.wst.xml.core.tests.model,
- org.eclipse.wst.xml.core.tests.text,
- org.eclipse.wst.xml.core.tests.text.testfiles.xml,
- org.eclipse.wst.xml.core.tests.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.wst.xml.core,
- org.junit,
- org.eclipse.core.filebuffers,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.text,
- org.eclipse.wst.sse.core,
- com.ibm.icu
-Eclipse-LazyStart: true
diff --git a/tests/org.eclipse.wst.xml.core.tests/about.html b/tests/org.eclipse.wst.xml.core.tests/about.html
deleted file mode 100644
index 4ec598958..000000000
--- a/tests/org.eclipse.wst.xml.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>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/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.xml.core.tests/build.properties b/tests/org.eclipse.wst.xml.core.tests/build.properties
deleted file mode 100644
index 1ae926569..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/build.properties
+++ /dev/null
@@ -1,20 +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
-###############################################################################
-source.ssemodelxmltests.jar = src/
-output.ssemodelxmltests.jar = bin/
-bin.includes = plugin.xml,\
-               ssemodelxmltests.jar,\
-               test.xml,\
-               testfiles.zip,\
-               projecttestfiles/,\
-               META-INF/,\
-               about.html
-src.includes = build.properties
diff --git a/tests/org.eclipse.wst.xml.core.tests/plugin.properties b/tests/org.eclipse.wst.xml.core.tests/plugin.properties
deleted file mode 100644
index 4808a5e21..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.xml.core.tests
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = SSE Model XML Tests
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/plugin.xml b/tests/org.eclipse.wst.xml.core.tests/plugin.xml
deleted file mode 100644
index 03f1a8cb3..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-	<extension point="org.eclipse.core.runtime.contentTypes">
-		<!-- associate .fragx files with the XML content type -->
-		<file-association
-			content-type="org.eclipse.core.runtime.xml"
-			file-extensions="fragx" />
-	</extension>
-
-	<extension
-		id="Test"
-		point="org.eclipse.core.runtime.applications">
-		<application>
-			<run
-				class="org.eclipse.wst.xml.core.tests.contentmodel.CMVisitorTest" />
-		</application>
-	</extension>
-
-</plugin>
diff --git a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip b/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip
deleted file mode 100644
index 683ad6c45..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/projecttestfiles/xml-document-loader-tests.zip
+++ /dev/null
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java
deleted file mode 100644
index e47dccf4f..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/internal/document/test/NodeImplTestCase.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Balazs Banfai: Bug 154737 getUserData/setUserData support for Node
- *     https://bugs.eclipse.org/bugs/show_bug.cgi?id=154737
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.core.internal.document.test;
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.document.NodeImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.UserDataHandler;
-
-
-public class NodeImplTestCase extends TestCase {
-	/**
-	 * Casts to implementation classes because the interface methods being
-	 * there isn't the interesting part, just whether our behavior with those
-	 * methods is correct.
-	 */	
-
-	NodeImpl element;
-	AttrImpl attribute;
-	NodeImpl destinationNode;
-	Document document;
-	
-	Element elementToImport;
-	
-	private static final String KEY="key";
-	private static final String VALUE="value";
-	private static final String KEY2="key2";
-	private static final String VALUE2="value2";
-	
-	
-	/**
-     * Sets up the test fixture. 
-     * (Called before every test case method.) 
-     */ 
-    protected void setUp() { 
-        
-    	DOMModelImpl model = new DOMModelImpl();
-    	document = model.getDocument();
-    	element = (NodeImpl)document.createElement("testelement");
-    	attribute = (AttrImpl)document.createAttribute("attribute");
-    } 
-	
-    /*
-     * Test for null;
-     */
-	public void testGetUserData0() {
-		assertEquals(null, element.getUserData(KEY));
-		assertEquals(null, element.getUserData(null));
-	}
-    
-	/*
-	 * Test for one key/value
-	 */
-    public void testGetUserData1() {
-		element.setUserData(KEY, VALUE, null);
-		assertEquals(VALUE,element.getUserData(KEY));
-		assertEquals(null, attribute.getUserData(KEY));
-	}
-	
-    /*
-     * Test for multiple nodes
-     */
-	public void testGetUserData2() {
-		element.setUserData(KEY, VALUE, null);
-		assertEquals(VALUE,element.getUserData(KEY));
-		attribute.setUserData(KEY2, VALUE2, null);
-		assertEquals(VALUE2,attribute.getUserData(KEY2));
-	}
-	
-	/*
-	 * Test for multiple keys
-	 */
-	public void testGetUserData3() {
-		element.setUserData(KEY, VALUE, null);
-		element.setUserData(KEY2, VALUE2, null);
-		assertEquals(VALUE,element.getUserData(KEY));
-		assertEquals(VALUE2,element.getUserData(KEY2));
-	}
-
-	/*
-	 * Test for null key
-	 */
-	public void testSetUserData1() {
-		assertEquals(null, element.setUserData(null, VALUE, null));
-	}
-
-	/*
-	 * Test for null data with no previous value
-	 */
-	public void testSetUserData2() {
-		assertEquals(null, element.setUserData(KEY, null, null));
-	}
-	
-	/*
-	 * Test for overwriting
-	 */
-	public void testSetUserData3() {
-		element.setUserData(KEY, VALUE, null);
-		element.setUserData(KEY, VALUE2, null);
-		assertEquals(VALUE2, element.getUserData(KEY));
-	}
-	
-	/* 
-	 * Test for deleting
-	 */
-	public void testSetUserData4() {
-		element.setUserData(KEY, VALUE, null);
-		assertEquals(VALUE, element.getUserData(KEY));
-		element.setUserData(KEY, null, null);
-		assertEquals(null, element.getUserData(KEY));
-	}
-	
-	/*
-	 * Test for notifying the UserDataHandler=null
-	 */
-	public void testNotifyUserDataHandler0() {
-		
-		attribute.setUserData(KEY, VALUE, null);
-		destinationNode=(NodeImpl)attribute.cloneNode(true);
-	}
-	
-	/*
-	 * Test for notifying the UserDataHandler when cloning an attribute
-	 */
-	public void testNotifyUserDataHandler1() {
-		
-		attribute.setUserData(KEY, VALUE, new UserDataHandler(){
-
-			public void handle(short operation, String key, Object data, Node src, Node dst) {
-				assertEquals(UserDataHandler.NODE_CLONED, operation);
-				assertEquals(VALUE, data);
-				assertEquals(KEY, key);
-				assertEquals(src, attribute); 
-				
-				System.out.println("Operation: "+operation+" Key:"+ key 
-						+ " Object:"+data+" SourceNode:"+src.getLocalName()+" DestinationNode:"+dst.getLocalName());
-				
-			}
-		});
-		//event occurs before the destinationNode returns....
-		destinationNode=(AttrImpl)attribute.cloneNode(true);
-	}
-	
-	/*
-	 * Test for notifying the UserDataHandler when importing
-	 */
-	public void testNotifyUserDataHandler2() {
-    	elementToImport = document.createElement("ElementToImport");
-    	((NodeImpl)elementToImport).setUserData(KEY, VALUE, new UserDataHandler(){
-
-			public void handle(short operation, String key, Object data, Node src, Node dst) {
-
-				//see if NODE.IMPORTED notification occurs with the right
-				//parameters
-				if (operation==UserDataHandler.NODE_IMPORTED) {	
-				assertEquals(VALUE, data);
-				assertEquals(KEY, key);
-				assertEquals(src, elementToImport);
-				assertEquals(dst, null);  
-				System.out.println("Operation: "+operation+" Key:"+ key 
-						+ " Object:"+data+" SourceNode:"+src.getLocalName()+" DestinationNode:"+dst);
-				}
-			}
-		});
-		document.importNode(elementToImport, true);
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java
deleted file mode 100644
index bf2c404d8..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/Logger.java
+++ /dev/null
@@ -1,145 +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.xml.core.tests;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if desired,
- * the console. This class should only be used by classes in this plugin. Other
- * plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.xml.core.tests"; //$NON-NLS-1$
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * Adds message to log.
-	 * @param level severity level of the message (OK, INFO, WARNING, ERROR, OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message text to add to the log
-	 * @param exception exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * @param message text to print
-	 * @param category category of the message, to be compared with /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java
deleted file mode 100644
index fa99dffa8..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestSuite.java
+++ /dev/null
@@ -1,57 +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.xml.core.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.xml.core.internal.document.test.NodeImplTestCase;
-import org.eclipse.wst.xml.core.tests.contentmodel.TestCatalogRetrivalAndModelCreation;
-import org.eclipse.wst.xml.core.tests.document.GetDocumentRegionsTest;
-import org.eclipse.wst.xml.core.tests.document.TestStructuredDocument;
-import org.eclipse.wst.xml.core.tests.document.TestXMLDocumentLoader;
-import org.eclipse.wst.xml.core.tests.document.TransitionTests;
-import org.eclipse.wst.xml.core.tests.dom.NameValidatorTests;
-import org.eclipse.wst.xml.core.tests.format.TestFormatProcessorXML;
-import org.eclipse.wst.xml.core.tests.model.TestModelManager;
-import org.eclipse.wst.xml.core.tests.model.TestModelsFromFiles;
-import org.eclipse.wst.xml.core.tests.model.TestStructuredModel;
-import org.eclipse.wst.xml.core.tests.model.TestXMLModelLoader;
-import org.eclipse.wst.xml.core.tests.text.TestStructuredPartitionerXML;
-
-
-
-public class SSEModelXMLTestSuite extends TestSuite {
-	public static Test suite() {
-		return new SSEModelXMLTestSuite();
-	}
-
-	public SSEModelXMLTestSuite() {
-		super("Test Suite for org.eclipse.wst.xml.core.tests");
-		addTest(new TestSuite(TestModelsFromFiles.class));
-		addTest(new TestSuite(TestXMLModelLoader.class));
-		addTest(new TestSuite(TestXMLDocumentLoader.class));
-		addTest(new TestSuite(TestStructuredDocument.class));
-		
-		addTest(new TestSuite(TestModelManager.class));
-		addTest(new TestSuite(TestStructuredModel.class));
-		addTest(new TestSuite(TestStructuredPartitionerXML.class));
-		addTest(new TestSuite(NameValidatorTests.class));
-		addTest(new TestSuite(TransitionTests.class));
-		addTest(new TestSuite(XMLCorePreferencesTest.class));
-		addTest(new TestSuite(TestCatalogRetrivalAndModelCreation.class));
-		
-		addTest(new TestSuite(GetDocumentRegionsTest.class));
-		addTest(new TestSuite(NodeImplTestCase.class));
-
-		addTest(new TestSuite(TestFormatProcessorXML.class));
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java
deleted file mode 100644
index e3bbc4e61..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/SSEModelXMLTestsPlugin.java
+++ /dev/null
@@ -1,80 +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.xml.core.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 SSEModelXMLTestsPlugin extends Plugin {
-	//The shared instance.
-	private static SSEModelXMLTestsPlugin plugin;
-
-	/**
-	 * The constructor.
-	 */
-	public SSEModelXMLTestsPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static SSEModelXMLTestsPlugin 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.xml.core.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;
-	}
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java
deleted file mode 100644
index 0513f1400..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/XMLCorePreferencesTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.encoding.ContentBasedPreferenceGateway;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.document.IEncodedDocument;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * The purpose of this test is to verify the validity of the XML Source editor
- * preferences. Tests include setting/getting preferences.
- * 
- * NOTE: This test should be preformed on a clean workspace. If performed on
- * an existing workspace, this test will manipulate preferences in the
- * workspace, though attempts will be made to restore original values after
- * testing.
- */
-public class XMLCorePreferencesTest extends TestCase {
-	/**
-	 * Tests existance of preference values when getting preference values
-	 * through Platform.getPreferencesService()
-	 */
-	public void testBundleGetPreferences() {
-		final String bundleName = "org.eclipse.wst.xml.core";
-
-		// need to start up bundle for default values to be loaded
-		Bundle bundle = Platform.getBundle(bundleName);
-		try {
-			if (bundle != null)
-				bundle.start();
-			else
-				fail("Get preference value failed because could not find bundle: " + bundleName);
-		}
-		catch (BundleException e) {
-			fail("Get preference value failed because of exception starting bundle: " + bundleName + " exception: " + e);
-		}
-
-		bundleGetPreference(bundleName, XMLCorePreferenceNames.INDENTATION_SIZE);
-		bundleGetPreference(bundleName, XMLCorePreferenceNames.LINE_WIDTH);
-	}
-
-	private void bundleGetPreference(String bundleName, String prefKey) {
-		int defaultValue = -1;
-
-		int value = Platform.getPreferencesService().getInt(bundleName, prefKey, defaultValue, null);
-		assertTrue("Get preference value failed using Platform.getPreferencesService. Key: " + prefKey, defaultValue != value);
-	}
-
-	/**
-	 * Tests default values of preferences.
-	 * 
-	 * NOTE: Expected default values are hard-coded, so if default values do
-	 * get changed, assertions need to be updated as well
-	 */
-	public void testPluginGetDefaultPreferences() {
-		IEclipsePreferences node = new DefaultScope().getNode(XMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		pluginGetDefaultPreference(node, XMLCorePreferenceNames.SPLIT_MULTI_ATTRS, Boolean.toString(false));
-		pluginGetDefaultPreference(node, XMLCorePreferenceNames.INDENTATION_CHAR, XMLCorePreferenceNames.TAB);
-	}
-
-	private void pluginGetDefaultPreference(IEclipsePreferences node, String prefKey, String expected) {
-		String defaultValue = Long.toString(System.currentTimeMillis()); // random
-		// string
-
-		String theDefaultValue = node.get(prefKey, defaultValue);
-		assertEquals("Get default preference value failed using plugin.getPreferenceStore. Key: " + prefKey, expected, theDefaultValue);
-	}
-
-	/**
-	 * Tests setting preference values by setting preference value to be a
-	 * certain value, then getting the preference value to verify it was set.
-	 */
-	public void testPluginSetPreferences() {
-		IEclipsePreferences node = new InstanceScope().getNode(XMLCorePlugin.getDefault().getBundle().getSymbolicName());
-
-		pluginSetPreferenceBoolean(node, XMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES);
-		pluginSetPreferenceString(node, XMLCorePreferenceNames.INDENTATION_CHAR);
-	}
-
-	private void pluginSetPreferenceBoolean(IEclipsePreferences node, String prefKey) {
-		boolean originalValue = false;
-		boolean expectedValue = true;
-
-		String originalString = node.get(prefKey, "bogus");
-		if (!"bogus".equals(originalString)) {
-			originalValue = Boolean.valueOf(originalString).booleanValue();
-			expectedValue = !originalValue;
-		}
-		node.putBoolean(prefKey, expectedValue);
-		boolean foundValue = node.getBoolean(prefKey, true);
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		if ("bogus".equals(originalString))
-			node.remove(prefKey);
-		else
-			node.put(prefKey, originalString);
-	}
-
-	private void pluginSetPreferenceString(IEclipsePreferences node, String prefKey) {
-		String originalValue = node.get(prefKey, "bogus");
-		String expectedValue = Long.toString(System.currentTimeMillis()); // random
-		// string
-		node.put(prefKey, expectedValue);
-		String foundValue = node.get(prefKey, "");
-		assertEquals("Set preference value failed using plugin.getPreferenceStore. Key: " + prefKey + "  expected: " + expectedValue + " found: " + foundValue, expectedValue, foundValue);
-
-		// attempt to restore original preference value
-		if ("bogus".equals(originalValue))
-			node.remove(prefKey);
-		else
-			node.put(prefKey, originalValue);
-	}
-
-	/**
-	 * Tests line delimiter preferences by making sure document created
-	 * follows line delimiter preference.
-	 */
-	public void testDelimiterPreferences() {
-		// check if content type preferences match
-		String preferredDelimiter = ContentTypeEncodingPreferences.getPreferredNewLineDelimiter(ContentTypeIdForXML.ContentTypeID_XML);
-		Preferences prefs = ContentBasedPreferenceGateway.getPreferences(ContentTypeIdForXML.ContentTypeID_XML);
-		String gatewayDelimiter = prefs.get(CommonEncodingPreferenceNames.END_OF_LINE_CODE, null);
-		assertEquals("ContentTypeEncodingPreferences and ContentBasedPreferenceGateway preferences do not match", gatewayDelimiter, preferredDelimiter);
-
-		// set a particular line delimiter
-		prefs.put(CommonEncodingPreferenceNames.END_OF_LINE_CODE, CommonEncodingPreferenceNames.LF);
-
-		// create document
-		XMLDocumentLoader loader = new XMLDocumentLoader();
-		IEncodedDocument document = loader.createNewStructuredDocument();
-		String documentDelimiter = document.getPreferredLineDelimiter();
-
-		// verify delimiter in document matches preference
-		assertEquals("Delimiter in document does not match preference", CommonEncodingPreferenceNames.STRING_LF, documentDelimiter);
-
-		// return to original preference
-		prefs.remove(CommonEncodingPreferenceNames.END_OF_LINE_CODE);
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java
deleted file mode 100644
index 4ba521202..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMPrinter.java
+++ /dev/null
@@ -1,325 +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.xml.core.tests.contentmodel;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMEntityDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-
-
-public class CMPrinter extends CMVisitor
-{
-  protected StringBuffer fStringBuffer = new StringBuffer();
-  protected Vector visitedElements = new Vector(); 
-    
-  /******   formatting    ******/
-  protected String indent = ""; //$NON-NLS-1$
-
-  protected void incrementIndent()
-  {
-    indent = indent + "  "; //$NON-NLS-1$
-  }
-
-  protected void decrementIndent()
-  {
-    indent = indent.substring(0, indent.length()-2);
-  }
-
-
-  public void printCMNode(String filename, CMNode cmnode)
-  {
-    visitCMNode(cmnode);
-    try 
-    {
-      FileOutputStream fileStream = new FileOutputStream(filename);
-      OutputStreamWriter writer = new OutputStreamWriter(fileStream);
-      writer.write(fStringBuffer.toString());
-      writer.flush();
-      fileStream.close();
-    }
-    catch (IOException e) {
-    	Logger.logException("PMPrinter Debug: ", e);
-    }  
-  }
-
-  public void visitCMAnyElement(CMAnyElement anyElement)
-  {
-    fStringBuffer.append(indent + "<CMAnyElement"); //$NON-NLS-1$
-    printAttributes(fStringBuffer, anyElement);
-    fStringBuffer.append(">/n"); //$NON-NLS-1$
-    incrementIndent();
-    printProperties(fStringBuffer, anyElement);
-    decrementIndent();
-    fStringBuffer.append(indent + "</CMAnyElement>/n"); //$NON-NLS-1$
-  }
-
-  public void visitCMAttributeDeclaration(CMAttributeDeclaration ad)
-  {
-    fStringBuffer.append(indent + "<CMAttributeDeclaration"); //$NON-NLS-1$
-    printAttributes(fStringBuffer, ad);
-    fStringBuffer.append(">\n"); //$NON-NLS-1$
-    incrementIndent();
-    printProperties(fStringBuffer, ad);
-    decrementIndent();
-    visitCMNode(ad.getAttrType());
-    fStringBuffer.append(indent + "</CMAttributeDeclaration>\n"); //$NON-NLS-1$
-  }
-
-  public void visitCMDataType(CMDataType dataType)
-  {
-    fStringBuffer.append(indent + "<CMDataType"); //$NON-NLS-1$
-    printAttributes(fStringBuffer, dataType);
-    fStringBuffer.append(">\n"); //$NON-NLS-1$
-    incrementIndent();
-    fStringBuffer.append(indent + "<ImpliedValue kind=\"" + dataType.getImpliedValueKind() + "\">"); //$NON-NLS-1$ //$NON-NLS-2$
-    fStringBuffer.append(dataType.getImpliedValue() + "</ImpliedValue>\n"); //$NON-NLS-1$
-    printEnumeration(fStringBuffer, dataType.getEnumeratedValues());
-    decrementIndent();
-    fStringBuffer.append(indent + "</CMDataType>\n"); //$NON-NLS-1$
-  }
-
-  public void visitCMDocument(CMDocument document)
-  {
-    fStringBuffer.append(indent + "<CMDocument"); //$NON-NLS-1$
-    printAttributes(fStringBuffer, document);
-    fStringBuffer.append(">\n"); //$NON-NLS-1$
-    incrementIndent();
-
-    //    printEntities(sb, document.getEntities()); 
-    printProperties(fStringBuffer, document);
-
-    CMNamedNodeMap map = document.getElements();
-    int size = map.getLength();
-    for (int i = 0; i < size; i++)
-    {
-      visitCMNode(map.item(i));
-    }
-
-    decrementIndent();
-    fStringBuffer.append(indent + "</CMDocument>\n"); //$NON-NLS-1$
-  }
-
-  public void visitCMGroup(CMGroup group)
-  {
-    fStringBuffer.append(indent + "<CMGroup"); //$NON-NLS-1$
-    printAttributes(fStringBuffer, group);
-    fStringBuffer.append(">\n"); //$NON-NLS-1$
-    incrementIndent();
-
-    CMNodeList nodeList = group.getChildNodes();
-    int size = nodeList.getLength();
-    for (int i = 0; i < size; i++)
-    {
-      visitCMNode(nodeList.item(i));
-    }
-
-    decrementIndent();
-    fStringBuffer.append(indent + "</CMGroup>\n"); //$NON-NLS-1$
-  }
-
-  public void visitCMElementDeclaration(CMElementDeclaration ed)
-  {
-    if (!visitedElements.contains(ed))
-    {
-      visitedElements.add(ed);
-      fStringBuffer.append(indent + "<CMElementDeclaration"); //$NON-NLS-1$
-      printAttributes(fStringBuffer, ed);
-      fStringBuffer.append(">\n"); //$NON-NLS-1$
-      incrementIndent();
-      printProperties(fStringBuffer, ed);
-
-      CMNamedNodeMap nodeMap = ed.getAttributes();
-      int size = nodeMap.getLength();
-      for (int i = 0; i < size; i++)
-      {
-        visitCMNode(nodeMap.item(i));
-      }
-
-      visitCMNode(ed.getContent());
-
-      CMDataType dataType = ed.getDataType();
-      if (dataType != null)
-        visitCMNode(dataType);
-
-      decrementIndent();
-      fStringBuffer.append(indent + "</CMElementDeclaration>\n"); //$NON-NLS-1$
-    }
-  }
-
-
-  public void printEnumeration(StringBuffer sb, String[] values)
-  {
-    if ((values != null) && (values.length > 0))
-    {
-      sb.append(indent + "<Enumeration>\n"); //$NON-NLS-1$
-      incrementIndent();
-
-      for (int i=0; i<values.length; i++)
-      {
-        sb.append(indent + "<Value>" + values[i] + "</Values>\n"); //$NON-NLS-1$ //$NON-NLS-2$
-      }
-
-      decrementIndent();
-      sb.append(indent + "</Enumeration>\n"); //$NON-NLS-1$
-    }
-  }
-
-
-  public void printAttributes(StringBuffer sb, CMNode cmnode)
-  {
-    if (cmnode != null)
-    {
-      sb.append(" nodeName=\"" + cmnode.getNodeName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-      sb.append(" nodeType=\"" + cmnode.getNodeType() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-
-      if (cmnode instanceof CMContent)
-      {
-        sb.append(" minOccur=\"" + ((CMContent)cmnode).getMinOccur() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-        sb.append(" maxOccur=\"" + ((CMContent)cmnode).getMaxOccur() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-      }
-      if (cmnode instanceof CMAnyElement)
-      {
-        sb.append(" namespaceURI=\"" + ((CMAnyElement)cmnode).getNamespaceURI() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-      }
-      if (cmnode instanceof CMAttributeDeclaration)
-      {
-        sb.append(" uasage=\"" + ((CMAttributeDeclaration)cmnode).getUsage() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-        sb.append(" defaultValue=\"" + ((CMAttributeDeclaration)cmnode).getDefaultValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-      }
-      if (cmnode instanceof CMDataType)
-      { 
-        sb.append(" instanceValue=\"" + ((CMDataType)cmnode).generateInstanceValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-      }
-      if (cmnode instanceof CMEntityDeclaration)
-      {
-        String value = ((CMEntityDeclaration)cmnode).getValue();
-        if (value.indexOf("\"") == -1) sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        else sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-      }
-      if (cmnode instanceof CMGroup)
-      {
-        sb.append(" operator=\"" + ((CMGroup)cmnode).getOperator() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-      }
-      if (cmnode instanceof CMElementDeclaration)
-      {
-        sb.append(" contentType=\"" + ((CMElementDeclaration)cmnode).getContentType() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-      }
-    }
-  }
-
-
-  public void printEntities(StringBuffer sb, CMNamedNodeMap entities)
-  {
-    if ((entities != null) && (entities.getLength()>0))
-    {
-      sb.append(indent + "<Entities>\n"); //$NON-NLS-1$
-      incrementIndent();
-
-      for (Iterator i = entities.iterator(); i.hasNext();)
-      {
-        CMEntityDeclaration entity = (CMEntityDeclaration)i.next();
-        sb.append(indent + "<Entity"); //$NON-NLS-1$
-        printAttributes(sb, entity);
-        sb.append("/>\n"); //$NON-NLS-1$
-      }
-
-      decrementIndent();
-      sb.append(indent + "</Entities>\n"); //$NON-NLS-1$
-    }
-  }
-
-  public void printProperties(StringBuffer sb, CMNode cmnode)
-  {
-    List properties = getProperties(cmnode);
-    sb.append(indent + "<Properties>\n"); //$NON-NLS-1$
-    incrementIndent();
-
-    for (int i=0; i<properties.size(); i++)
-    {
-      String property = (String)properties.get(i);
-      sb.append(indent + "<Property name=\"" + property + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-
-      if (cmnode.supports(property))
-      {
-        sb.append(" supports=\"true\""); //$NON-NLS-1$
-      }
-      else
-      {
-        sb.append(" supports=\"false\""); //$NON-NLS-1$
-      }
-      Object value = cmnode.getProperty(property);
-      if (value instanceof String) sb.append(" value=\"" + (String)value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-      else if (value instanceof Boolean) sb.append(" value=\"" + value + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-      else if (value != null) sb.append(" value=\"" + value.getClass() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
-      else sb.append(" value=\"null\""); //$NON-NLS-1$
-      sb.append("/>\n"); //$NON-NLS-1$
-    }
-
-    decrementIndent();
-    sb.append(indent + "</Properties>\n"); //$NON-NLS-1$
-  }
-
-  public List getProperties(CMNode cmnode)
-  {
-    List properties = new Vector();
-      
-    if (cmnode != null)
-    {
-      properties.add("CMDocument"); //$NON-NLS-1$
-      properties.add("documentation"); //$NON-NLS-1$
-      properties.add("http://org.eclipse.wst/cm/properties/usesLocalElementDeclarations"); //$NON-NLS-1$
-      properties.add("http://org.eclipse.wst/cm/properties/isNameSpaceAware"); //$NON-NLS-1$
-      properties.add("http://org.eclipse.wst/cm/properties/nsPrefixQualification"); //$NON-NLS-1$
-      properties.add("http://org.eclipse.wst/cm/properties/nillable"); //$NON-NLS-1$
-      properties.add("http://org.eclipse.wst/cm/properties/mofNotifier"); //$NON-NLS-1$
-      properties.add("spec"); //$NON-NLS-1$
-
-      if (cmnode instanceof CMElementDeclaration)
-      {
-        properties.add("http://org.eclipse.wst/cm/properties/definitionInfo"); //$NON-NLS-1$
-        properties.add("http://org.eclipse.wst/cm/properties/definition"); //$NON-NLS-1$
-        properties.add("XSITypes"); //$NON-NLS-1$
-        properties.add("DerivedElementDeclaration"); //$NON-NLS-1$
-        // properties.add("SubstitutionGroup"); Currrently broken for nexted xsd files
-        properties.add("Abstract"); //$NON-NLS-1$
-      }
-      if (cmnode instanceof CMDocument)
-      {
-        properties.add("http://org.eclipse.wst/cm/properties/targetNamespaceURI"); //$NON-NLS-1$
-        properties.add("http://org.eclipse.wst/cm/properties/importedNamespaceInfo"); //$NON-NLS-1$
-        properties.add("http://org.eclipse.wst/cm/properties/namespaceInfo"); //$NON-NLS-1$
-        properties.add("http://org.eclipse.wst/cm/properties/elementFormDefault"); //$NON-NLS-1$
-        properties.add("annotationMap"); //$NON-NLS-1$
-      }
-    }
-    return properties;
-  }
-  
-}
-
- 
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java
deleted file mode 100644
index 346dfb3f2..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMUtility.java
+++ /dev/null
@@ -1,149 +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.xml.core.tests.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMVisitor;
-
-
-public class CMUtility
-{                                    
-  /**
-   * return true if the child or any of its ancestor group nodes are repeatable
-   */
-  public static boolean isNodeOrAncestorGroupRepeatable(CMContent content, CMNode child)
-  {                                                                            
-    // since we can't walk up the CMNode tree (why you ask? ... its a long story)
-    // we walk down the tree to consider the child's parent node's
-    //
-    boolean result = isRepeatable(child);
-    if (!result)
-    {
-      CanRepeatVisitor visitor = new CanRepeatVisitor(content, child);
-      visitor.visitCMNode(content);
-      result = visitor.getResult();
-    }
-    return result;
-  }
-
-  /**
-   * return true if the child is repeatable
-   */
-  public static boolean isNodeRepeatable(CMContent content, CMNode child)
-  {                                                                            
-    // since we can't walk up the CMNode tree (why you ask? ... its a long story)
-    // we walk down the tree to consider the child's parent node's
-    //
-    boolean result = isRepeatable(child);
-    if (!result)
-    {
-      IsRepeatableVisitor visitor = new IsRepeatableVisitor(content, child);
-      visitor.visitCMNode(content);
-      result = visitor.getResult();
-    }
-    return result;
-  }
-
-  public static boolean isRepeatable(CMNode child)
-  {                                
-    boolean result = false;
-    if (child instanceof CMContent)
-    {
-      CMContent content = (CMContent)child;
-      result = content.getMaxOccur() > 1 || content.getMaxOccur() == -1;
-    } 
-    return result;
-  }
-    
-   
-  protected static class CanRepeatVisitor extends CMVisitor
-  {                                             
-    public boolean result;
-    protected boolean isWithinRepeatableGroup;
-
-    protected CMNode root;
-    protected CMNode target;
-
-    public CanRepeatVisitor(CMNode root, CMNode target)
-    {
-      this.root = root;
-      this.target = target;
-    }
-
-    public void visitCMGroup(CMGroup group)
-    {         
-      boolean oldIsWithinRepeatableGroup = isWithinRepeatableGroup;
-                                           
-      isWithinRepeatableGroup = isRepeatable(group);
-      
-      super.visitCMGroup(group);
-
-      isWithinRepeatableGroup = oldIsWithinRepeatableGroup;
-    }                           
-
-    public void visitCMElementDeclaration(CMElementDeclaration cmelement)
-    {
-      if (cmelement == target)
-      {
-        result = isWithinRepeatableGroup;
-      }
-    }
-
-    public boolean getResult()
-    {
-      return result;
-    }  
-  }
-
-
-  protected static class IsRepeatableVisitor extends CMVisitor
-  {                                             
-    public boolean result = false;
-    protected CMGroup currentGroup;
-
-    protected CMNode root;
-    protected CMNode target;
-
-    public IsRepeatableVisitor(CMNode root, CMNode target)
-    {
-      this.root = root;
-      this.target = target;
-    }
-
-    public void visitCMGroup(CMGroup group)
-    {         
-      CMGroup previousGroup = currentGroup;
-      currentGroup = group;
-      super.visitCMGroup(group);
-      currentGroup = previousGroup;
-    }                           
-
-    public void visitCMElementDeclaration(CMElementDeclaration cmelement)
-    {
-      if (cmelement == target)
-      {
-        if (currentGroup != null)
-        {
-          result = ((currentGroup.getOperator() == CMGroup.CHOICE) &&
-                    (isRepeatable(currentGroup)));
-        }
-      }
-    }
-
-    public boolean getResult()
-    {
-      return result;
-    }  
-  }
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java
deleted file mode 100644
index dcd4d68a6..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMValidatorTest.java
+++ /dev/null
@@ -1,102 +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.xml.core.tests.contentmodel;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator.ElementPathRecordingResult;
-import org.eclipse.wst.xml.core.internal.contentmodel.internal.util.CMValidator.StringElementContentComparator;
-
-public class CMValidatorTest
-{
-  public static void main(String arg[])
-  {
-    if (arg.length > 1)
-    {
-      try
-      {
-        //CMDocumentFactoryRegistry.getInstance().registerCMDocumentBuilderWithClassName("org.eclipse.wst.xml.core.internal.contentmodel.mofimpl.CMDocumentBuilderImpl");
-
-        String grammarFileName = arg[0];
-        String elementName = arg[1];
-
-        CMDocument cmDocument = ContentModelManager.getInstance().createCMDocument(grammarFileName, null);
-        
-        CMNamedNodeMap elementMap = cmDocument.getElements();
-        CMElementDeclaration element = (CMElementDeclaration)elementMap.getNamedItem(elementName);
-        if (element != null)
-        { /*
-          println("found element [" + elementName + "]  contentType = " + element.getContentType());
-          GraphNode graphNode = createGraph(element);
-          printGraph(graphNode);
-          */
-          println("-------------- begin validate ---------------"); //$NON-NLS-1$
-
-          StringElementContentComparator comparator = new StringElementContentComparator();
-          CMValidator validator = new CMValidator();
-          ElementPathRecordingResult result = new ElementPathRecordingResult();
-          validator.getOriginArray(element, CMValidator.createStringList(arg, 2), comparator, result);
-          if (result.isValid)
-          {
-            CMNode[] nodeMapping = result.getOriginArray();
-            println("Validation Success!"); //$NON-NLS-1$
-            print("  "); //$NON-NLS-1$
-            for (int i = 0; i < nodeMapping.length; i++)
-            {
-              String name = nodeMapping[i] != null ? nodeMapping[i].getNodeName() : "null"; //$NON-NLS-1$
-              print("[" + name + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-            }
-            println(""); //$NON-NLS-1$
-          }
-          else
-          {
-            println("Validation Failed! "); //$NON-NLS-1$
-            if (result.errorMessage != null)
-            {
-              println("  " + result.errorMessage); //$NON-NLS-1$
-            }
-          }
-          println("-------------- end validate ---------------"); //$NON-NLS-1$
-        }
-        else
-        {
-          println("element [" + elementName + "] can not be found"); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-      }
-      catch (Exception e)
-      {
-        println("CMValidator error"); //$NON-NLS-1$
-        e.printStackTrace();
-      }
-    }
-    else
-    {
-      println("2 args required... only " + arg.length + " provided"); //$NON-NLS-1$ //$NON-NLS-2$
-      println("usage java org.eclipse.wst.newxml.util.XMLUtil grammarFileName rootElementName pattern"); //$NON-NLS-1$
-    }
-  }
-  
-  public static void print(String string)
-  {  
-  }
-    
-  public static void println(String string)
-  {  
-  }
-  
-  public static void printlnIndented(int indent, String string)
-  {
-  }    
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java
deleted file mode 100644
index 4ca8040f3..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java
+++ /dev/null
@@ -1,102 +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.xml.core.tests.contentmodel;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.XMLAssociationProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class CMVisitorTest implements IPlatformRunnable {
-	public Object run(Object a) {
-		String args[] = (String[]) a;
-		if (args.length > 0) {
-			test(args[0]);
-		}
-		else {
-			System.out.println("xml file name argument required"); //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	protected void test(String fileName) {
-
-		ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
-		try {
-			CMDocumentCache cache = new CMDocumentCache();
-			XMLAssociationProvider provider = new XMLAssociationProvider(cache) {
-			};
-
-			ModelQuery mq = new ModelQueryImpl(provider);
-
-			Thread.currentThread().setContextClassLoader(CMVisitorTest.class.getClassLoader());
-			DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-			Document document = builder.parse(fileName);
-
-			/*
-			 * ClassLoader prevClassLoader =
-			 * Thread.currentThread().getContextClassLoader();
-			 * Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-			 * Class theClass =
-			 * Class.forName("org.apache.xerces.parsers.DOMParser"); DOMParser
-			 * parser = (DOMParser)theClass.newInstance();
-			 * Thread.currentThread().setContextClassLoader(prevClassLoader);
-			 * parser.parse(new InputSource(fileName)); Document document =
-			 * parser.getDocument();
-			 */
-			visitNode(document, mq, 0);
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-		finally {
-			Thread.currentThread().setContextClassLoader(originalClassLoader);
-		}
-	}
-
-	protected void visitNode(Node node, ModelQuery mq, int indent) {
-		CMNode cmnode = mq.getCMNode(node);
-		printlnIndented(indent, "node :" + node.getNodeName() + " cmnode : " + (cmnode != null ? cmnode.getNodeName() : "null")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		NamedNodeMap map = node.getAttributes();
-		if (map != null) {
-			indent += 2;
-			int mapLength = map.getLength();
-			for (int i = 0; i < mapLength; i++) {
-				visitNode(map.item(i), mq, indent);
-			}
-			indent -= 2;
-		}
-		indent += 4;
-		NodeList list = node.getChildNodes();
-		int listLength = list.getLength();
-		for (int i = 0; i < listLength; i++) {
-			visitNode(list.item(i), mq, indent);
-		}
-		indent -= 4;
-	}
-
-	public static void printlnIndented(int indent, String string) {
-		for (int i = 0; i < indent; i++) {
-			System.out.print(" "); //$NON-NLS-1$
-		}
-		System.out.println(string);
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java
deleted file mode 100644
index e2a244188..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/TestCatalogRetrivalAndModelCreation.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.contentmodel;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.modelquery.XMLCatalogIdResolver;
-
-public class TestCatalogRetrivalAndModelCreation extends TestCase {
-
-	/**
-	 * Test that a known error case returns null.
-	 * 
-	 * @throws MalformedURLException
-	 * @throws IOException
-	 */
-	public void testKnownNotExist() throws MalformedURLException, IOException {
-		String JUNK_STRING = "doesNotExistTest";
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		String resolved = xmlCatalog.resolvePublic(JUNK_STRING, null);
-		assertNull("expected no match for " + JUNK_STRING, resolved);
-	}
-
-	public void removedtestWAPFORUM() throws MalformedURLException, IOException {
-		doTest("-//WAPFORUM//DTD WML 1.1//EN");
-	}
-
-	public void testXHTML10() throws MalformedURLException, IOException {
-		doTest("-//W3C//DTD XHTML 1.0 Strict//EN");
-	}
-
-	public void testXHTML10T() throws MalformedURLException, IOException {
-		doTest("-//W3C//DTD XHTML 1.0 Transitional//EN");
-	}
-
-	public void testXHTML10F() throws MalformedURLException, IOException {
-		doTest("-//W3C//DTD XHTML 1.0 Frameset//EN");
-	}
-
-	public void testXHTML10B() throws MalformedURLException, IOException {
-		doTest("-//W3C//DTD XHTML Basic 1.0//EN");
-	}
-
-	public void testXHTML11() throws MalformedURLException, IOException {
-		doTest("-//W3C//DTD XHTML 1.1//EN");
-	}
-	
-	/**
-	 * We expect the XMLCatalogResolver and XMLCatalogIdResolver
-	 * to resolve to the same URI given a public id in our catalog.
-	 * 
-	 * @throws MalformedURLException
-	 * @throws IOException
-	 */
-	public void testXHTML11_xmlresolver() throws MalformedURLException, IOException {
-		String EXPECTED_PUBLICID = "-//W3C//DTD XHTML 1.1//EN";
-		
-		// bug 117424, here ewe make up a base location to satisfy the resolver API
-		// that expects a non-null base location
-		String baseLocation = "http://www.example.org/testXHTML11.xml";
-		XMLCatalogIdResolver resolver = new XMLCatalogIdResolver(baseLocation, null);
-		String resolvedXML_Id = resolver.resolve(baseLocation, EXPECTED_PUBLICID, null);
-		
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		String resolvedXL_Cat = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
-		assertEquals(resolvedXL_Cat, resolvedXML_Id);		 
-	}
-	
-	public void testCMXHTML11() throws MalformedURLException, IOException {
-		doCMTest("-//W3C//DTD XHTML 1.1//EN");
-	}
-	public void removedtestXHTML10M() throws MalformedURLException, IOException {
-		doTest("-//WAPFORUM//DTD XHTML Mobile 1.0//EN");
-	}
-
-	public void removedtestWAP13() throws MalformedURLException, IOException {
-		doTest("-//WAPFORUM//DTD WML 1.3//EN");
-	}
-
-	public void test2001Schema() throws MalformedURLException, IOException {
-		doURITest("http://www.w3.org/2001/XMLSchema");
-	}
-
-	/**
-	 * Tests if dtd NOT in our catalog can have a content model 
-	 * created. 
-	 * 
-	 * @throws MalformedURLException
-	 * @throws IOException
-	 */
-	public void testExternalDTD() throws MalformedURLException, IOException {
-		doCM_directURITest("http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd");
-	}
-// Bug 123547 - temporarily comment these tests out.
-//	public void test2001SchemaCMDirect() throws MalformedURLException, IOException {
-//		doCM_directURITest("http://www.w3.org/2001/XMLSchema.xsd");
-//	}
-//	
-//	public void test2001SchemaCMCatalog() throws MalformedURLException, IOException {
-//		doURI_CMTest("http://www.w3.org/2001/XMLSchema");
-//	}
-	
-	public void testInvoiceRemote() throws MalformedURLException, IOException {
-		doCM_directURITest_checkElementCount("http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/Invoice.dtd", 18);
-	}	
-	
-	public void testInvoiceRemoteIndirect() throws MalformedURLException, IOException {
-		doCM_directURITest_checkElementCount("http://www.eclipse.org/webtools/wst/components/xsd/tests/dtd-references/IndirectInvoice.dtd", 18);
-	}
-	
-	private void doTest(String EXPECTED_PUBLICID) throws MalformedURLException, IOException {
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		String resolved = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
-		assertNotNull("expected to find " + EXPECTED_PUBLICID, resolved);
-	}
-
-	private void doCMTest(String EXPECTED_PUBLICID) throws MalformedURLException, IOException {
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		String resolved = xmlCatalog.resolvePublic(EXPECTED_PUBLICID, null);
-		ContentModelManager contentModelManager = ContentModelManager.getInstance();
-		CMDocument contentModel = contentModelManager.createCMDocument(resolved, null);
-		assertNotNull("expected to create content model for " + EXPECTED_PUBLICID, contentModel);
-	}
-
-	private void doCM_directURITest(String EXPECTED_URI) throws MalformedURLException, IOException {
-		ContentModelManager contentModelManager = ContentModelManager.getInstance();
-		CMDocument contentModel = contentModelManager.createCMDocument(EXPECTED_URI, null);
-		assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
-	}
-	
-	private void doCM_directURITest_checkElementCount(String EXPECTED_URI, int count) throws MalformedURLException, IOException {
-		ContentModelManager contentModelManager = ContentModelManager.getInstance();
-		CMDocument contentModel = contentModelManager.createCMDocument(EXPECTED_URI, null);
-		assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
-		int actualCount = contentModel.getElements().getLength(); 
-		assertEquals("count of element declarations found for content model create from " + EXPECTED_URI, contentModel.getElements().getLength(), actualCount);		
-	}	
-
-	private void doURITest(String EXPECTED_URI) throws MalformedURLException, IOException {
- 
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		String resolved = xmlCatalog.resolveURI(EXPECTED_URI);
-		assertNotNull("expected to find " + EXPECTED_URI, resolved);
-
-	}
-	 void doURI_CMTest(String EXPECTED_URI) throws MalformedURLException, IOException {
-		 
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		String resolved = xmlCatalog.resolveURI(EXPECTED_URI);
-		assertNotNull("expected to find " + EXPECTED_URI, resolved);
-		
-		ContentModelManager contentModelManager = ContentModelManager.getInstance();
-		CMDocument contentModel = contentModelManager.createCMDocument(resolved, null);
-		assertNotNull("expected to create content model for " + EXPECTED_URI, contentModel);
-
-	}
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java
deleted file mode 100644
index 0a47dbadd..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/FileBufferDocumentTester.java
+++ /dev/null
@@ -1,331 +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.xml.core.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-
-
-public class FileBufferDocumentTester extends UnzippedProjectTester {
-
-	private void doTestCreate(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException, IOException {
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		assertNotNull("Test Case in error. Could not find file " + filePath, file);
-		IPath locationPath = file.getLocation();
-		ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-		bufferManager.connect(locationPath, null);
-		ITextFileBuffer buffer = bufferManager.getTextFileBuffer(locationPath);
-		IDocument document = buffer.getDocument();
-		assertNotNull(document);
-		assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-		assertTrue("wrong partitioner in document.", expectedPartioner.isInstance(document.getDocumentPartitioner()));
-		bufferManager.disconnect(locationPath, null);
-
-//		doTestCreateWithFacade(file, expectedDocumentClass, expectedPartioner);
-		 
-	}
-
-	/**
-	 * @param file
-	 * @param expectedDocumentClass
-	 * @param expectedPartioner
-	 * @throws CoreException
-	 * @throws IOException
-	 */
-//	private void doTestCreateWithFacade(IFile file, Class expectedDocumentClass, Class expectedPartioner) throws IOException, CoreException {
-//		DocumentLoaderForXML documentLoaderForXML = new DocumentLoaderForXML();
-//		IDocument document = documentLoaderForXML.createNewStructuredDocument(file, null);
-//		Assert.assertNotNull(document);
-//	}
-
-	private void doTestCreateCreateEmpty(String filePath, Class expectedDocumentClass, Class expectedPartioner) throws CoreException {
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		assertTrue("Test Case in error. Non-existent file existed! " + filePath, file == null);
-		IPath locationPath = new Path(filePath);
-		IFile nonExistingFile = fTestProject.getFile(locationPath);
-		locationPath = nonExistingFile.getFullPath();
-		ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-		// can not "connect" to non-existant location
-		//bufferManager.connect(locationPath, null);
-		IDocument document = bufferManager.createEmptyDocument(locationPath);
-		assertNotNull(document);
-		assertTrue("wrong class of document", expectedDocumentClass.isInstance(document));
-		assertTrue("wrong partitioner in document", expectedPartioner.isInstance(document.getDocumentPartitioner()));
-		bufferManager.disconnect(locationPath, null);
-
-	}
-
-
-
-	public void testFile103() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/EmptyFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile104() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/eucjp.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile105() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/IllformedNormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile106() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/MalformedNoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile107() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/MalformedNoEncoding.xsl", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile108() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/NoEncoding.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile109() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/NormalNonDefault.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile110() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/shiftjis.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile111() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testExtraJunk.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile112() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testExtraValidStuff.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile113() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile114() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile115() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed3.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile116() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testIllFormed4.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile117() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testMultiLine.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile118() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoEncodingValue.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile119() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile120() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoXMLDecl.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile121() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoXMLDeclAtFirst.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile122() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNoXMLDeclInLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile123() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testUTF16.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile124() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/UTF16LEAtStartOfLargeFile.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile125() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeader2.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile126() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/utf16UnicodeStreamWithNoEncodingInHeaderBE.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile127() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/utf16WithJapaneseChars.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testFile128() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/UTF8With3ByteBOM.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testNonExistentXML() throws CoreException {
-		doTestCreateCreateEmpty("testfiles/xml/testnonexistent.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	public void testSimpleCase() throws CoreException, IOException {
-		doTestCreate("testfiles/xml/testNormalCase.xml", BasicStructuredDocument.class, StructuredTextPartitionerForXML.class);
-	}
-
-	/*
-	public void testFile1() throws CoreException, IOException {
-		doTestCreate("testfiles/css/emptyFile.css", BasicStructuredDocument.class, StructuredTextPartitionerForCSS.class);
-	}
-
-
-
-	public void testFile70() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/MalformedNoEncodingXSL.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile81() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testBrokenLine.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile82() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testDefaultEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile83() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testDefaultEncodingWithJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile84() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testExtraJunk.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile85() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testExtraValidStuff.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile86() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testIllFormed.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile87() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testIllFormed2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile88() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoEncodingValue.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile89() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoPageDirective.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile90() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoPageDirectiveAtFirst.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile91() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNoPageDirectiveInLargeFile.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile92() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testNormalCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile93() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/testUTF16.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile94() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeader2.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile95() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/utf16UnicodeStreamWithNoEncodingInHeaderBE.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile96() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/utf16WithJapaneseChars.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile97() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/UTF8With3ByteBOM.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile98() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/WellFormedNormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile99() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile100() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect223365/SelColBeanRow12ResultsFormB.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile101() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect224293/testshiftjisXmlSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile102() throws CoreException, IOException {
-		doTestCreate("testfiles/regressionTestFiles/defect229667/audi.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-
-	public void testFile71() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/noEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile72() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NoEncodinginXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile73() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCase.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile74() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCaseNoEncoding.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile75() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingCharset.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile76() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/nomalDirectiveCaseUsingXMLSyntax.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile77() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NormalNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile78() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NormalNonDefaultWithXMLDecl.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile79() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/NormalPageCaseNonDefault.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-
-	public void testFile80() throws CoreException, IOException {
-		doTestCreate("testfiles/jsp/SelColBeanRow12ResultsForm.jsp", BasicStructuredDocument.class, StructuredTextPartitionerForJSP.class);
-	}
-*/
-}
-\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java
deleted file mode 100644
index f65276ae0..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/GetDocumentRegionsTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.eclipse.wst.xml.core.tests.document;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-public class GetDocumentRegionsTest extends TestCase {
-	
-	private boolean fAlreadySetup = false;
-	private IStructuredDocument fDoc = null;
-	private String fText = null;
-	
-	protected void setUp() throws Exception {
-		super.setUp();
-		if(!fAlreadySetup) {
-			IStructuredModel sModel = createModel(ContentTypeIdForXML.ContentTypeID_XML);
-			fDoc = sModel.getStructuredDocument();
-			fText = "<html><head></head><body> text </body></html>";
-			fDoc.set(fText);
-			fAlreadySetup = true;
-		}
-	}
-	
-	public void testGetAllRegions() {
-
-		// all regions
-		IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions();
-		checkRegions(regions, 7, "<html>", "</html>");
-	}
-
-	public void testExcludeEnds() {
-		
-		// leave off the end regions
-		// <html>[<head><body> text </body>]</html>
-		IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(6,fText.length() - (6+7));
-		checkRegions(regions, 5, "<head>", "</body>");
-	}
-
-	public void testIncludeEnds() {
-		
-		// include end regions
-		// <ht[ml><head></head><body> text </body></ht]ml>
-		IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(3,fText.length()- (3+3));
-		assertEquals(7, regions.length);
-	}
-
-	public void testFirstTwo() {
-		// first 2 regions
-		// <h[tml><h]ead></head>
-		IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(2,6);
-		checkRegions(regions, 2, "<html>", "<head>");
-	}
-
-	public void testRightSeam() {
-		// right seam
-		// [<html><head>]</head>
-		IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(0,12);
-		checkRegions(regions, 2, "<html>", "<head>");
-	}
-
-	public void testLeftSeam() {
-		// left seam
-		// </body>[</html>]
-		IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(fText.length()-7, 7);
-		checkRegions(regions, 1, "</html>", "</html>");
-	}
-
-	public void testGetLast() {
-		// last region only
-		// </body></html>|
-		IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(fText.length(), 0);
-		checkRegions(regions, 1, "</html>", "</html>");
-	}
-
-	public void testGetFirst() {
-		// first region only
-		// |<html><head>
-		IStructuredDocumentRegion[] regions = fDoc.getStructuredDocumentRegions(0,0);
-		checkRegions(regions, 1, "<html>", "<html>");
-	}
-
-	private void checkRegions(IStructuredDocumentRegion[] regions, int expectedLength, String firstText, String lastText) {
-		
-		//for (int i = 0; i < regions.length; i++) 
-		//	System.out.println(regions[i].getText());
-		
-		assertEquals(expectedLength, regions.length);
-		
-		String text = regions[0].getText();
-		assertEquals(text, firstText);
-		
-		text = regions[regions.length-1].getText();
-		assertEquals(text, lastText);
-	}
-	
-	private IStructuredModel createModel(String contentTypeID) {
-		// create an empty model with its default factories
-		IStructuredModel model = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID);
-		return model;
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java
deleted file mode 100644
index 1d1f03af4..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestStructuredDocument.java
+++ /dev/null
@@ -1,372 +0,0 @@
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.BadPositionCategoryException;
-import org.eclipse.jface.text.Position;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.encoding.EncodingMemento;
-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.events.IStructuredDocumentListener;
-import org.eclipse.wst.sse.core.internal.provisional.events.NewDocumentEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.NoChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionChangedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestStructuredDocument extends TestCase {
-
-	class TestListener implements IStructuredDocumentListener {
-
-		boolean newModelCalled = false;
-		boolean noChangeCalled = false;
-		boolean nodesReplacedCalled = false;
-		boolean regionChangedCalled = false;
-		boolean regionsReplacedCalled = false;
-
-		public void newModel(NewDocumentEvent structuredDocumentEvent) {
-			newModelCalled = true;
-		}
-
-		public void noChange(NoChangeEvent structuredDocumentEvent) {
-			noChangeCalled = true;
-		}
-
-		public void nodesReplaced(StructuredDocumentRegionsReplacedEvent structuredDocumentEvent) {
-			nodesReplacedCalled = true;
-		}
-
-		public void regionChanged(RegionChangedEvent structuredDocumentEvent) {
-			regionChangedCalled = true;
-		}
-
-		public void regionsReplaced(RegionsReplacedEvent structuredDocumentEvent) {
-			regionsReplacedCalled = true;
-		}
-	}
-
-	private boolean isSetup = false;
-	
-
-	private final String fProjectName = "DOCUMENT-LOADER";
-	private final String fZipFileName = "xml-document-loader-tests.zip";
-
-	public TestStructuredDocument() {
-		super("TestStructuredDocument");
-	}
-
-	protected void setUp() throws Exception {
-
-		super.setUp();
-		if (!this.isSetup) {
-			
-			doSetup();
-			this.isSetup = true;
-		}
-	}
-
-	private void doSetup() throws Exception {
-
-		// root of workspace directory
-		Location platformLocation = Platform.getInstanceLocation();
-
-		ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
-		File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
-		unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
-		unzipUtil.initJavaProject(fProjectName);
-	}
-
-	/**
-	 * Be sure to release any models obtained from this method.
-	 * 
-	 */
-	IStructuredModel getTestModel() throws IOException, CoreException {
-
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(fProjectName);
-		IFile iFile = (IFile) project.findMember("/files/simple.xml");
-		// fProjectName + "/files/simple.xml"
-
-
-		IStructuredModel model = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-
-		model = modelManager.getModelForEdit(iFile);
-
-
-		return model;
-
-	}
-
-
-
-	public void testDocumentChangingListener() throws BadLocationException, IOException, CoreException {
-		// TODO: may need to fake events to really tests this
-
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-
-			TestListener listener = new TestListener();
-
-			sDoc.addDocumentChangingListener(listener);
-			String text = sDoc.get();
-			sDoc.replace(0, text.length(), text);
-
-			sDoc.removeDocumentChangingListener(listener);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testReadOnly() throws IOException, CoreException {
-
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			String text = sDoc.get();
-
-			sDoc.clearReadOnly(0, text.length());
-			assertFalse(sDoc.containsReadOnly(0, text.length()));
-
-			sDoc.makeReadOnly(0, 10);
-			assertTrue(sDoc.containsReadOnly(9, 1));
-			assertTrue(sDoc.containsReadOnly(0, text.length()));
-
-			sDoc.clearReadOnly(0, text.length());
-			assertFalse(sDoc.containsReadOnly(0, text.length()));
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testGetRegionAtCharacterOffset() throws IOException, CoreException {
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			IStructuredDocumentRegion r = sDoc.getRegionAtCharacterOffset(0);
-			assertNotNull("couldn't get region at offset: 0", r);
-
-			r = sDoc.getRegionAtCharacterOffset(sDoc.getLength());
-			assertNotNull("couldn't get region at offset: " + sDoc.getLength(), r);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-
-		}
-	}
-
-	public void testGetRegionList() throws IOException, CoreException {
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			IStructuredDocumentRegionList regions = sDoc.getRegionList();
-			assertNotNull("couldn't get region list", regions);
-			assertEquals(17, regions.getLength());
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testGetText() throws IOException, CoreException {
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			String text = sDoc.getText();
-			String expectedText = "<?xml version=\"1.0\"?>\r\n<list>\r\n\t<item1 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\">\r\n\t\tone\r\n\t</item1>\r\n\t<item2 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\" >\r\n\t\ttwo\r\n\t</item2>\r\n\t<item3 attr1=\"attr1\" attr2=\"attr2\" attr3=\"attr3\">\r\n\t\tthree\r\n\t</item3>\r\n</list>";
-			assertEquals(expectedText, text);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testNewInstance() throws IOException, CoreException {
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			IStructuredDocument newDoc = sDoc.newInstance();
-			assertNotSame("document instances should be different", sDoc, newDoc);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testReplaceText() throws BadLocationException, IOException, CoreException {
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			sDoc.replace(0, sDoc.getLength(), "replaced");
-
-			String text = sDoc.getText();
-			assertEquals("replaced", text);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testOverrideReadOnlyReplaceText() throws IOException, CoreException {
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			sDoc.makeReadOnly(0, 1);
-			sDoc.replaceText(this, 0, sDoc.getLength(), "replaced");
-			assertNotSame("text should not have been replacable (read only)", "replaced", sDoc.getText());
-
-			sDoc.replaceText(this, 0, sDoc.getLength(), "replaced", true);
-			assertEquals("text should have been forced replaced", "replaced", sDoc.getText());
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testSetText() throws IOException, CoreException {
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			sDoc.setText(this, "set text");
-
-			assertEquals("set text failed", "set text", sDoc.getText());
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testGetEncodingMemento() throws IOException, CoreException {
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = null;
-			sDoc = model.getStructuredDocument();
-			EncodingMemento memento = sDoc.getEncodingMemento();
-			assertNotNull("couldn't get encoding memento", memento);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testGetDetectedLineDelimiter() throws IOException, CoreException {
-		String platformDelimiter = System.getProperty("line.separator");
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			String delim = sDoc.getLineDelimiter();
-			assertEquals("wrong preferred line delmiter", platformDelimiter, delim);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testSetEncodingMemento() throws IOException, CoreException {
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			EncodingMemento memento = new EncodingMemento();
-			sDoc.setEncodingMemento(memento);
-			EncodingMemento gottenMemento = sDoc.getEncodingMemento();
-			assertEquals("mementos don't match", memento, gottenMemento);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	void setDetectedLineDelimiter() throws IOException, CoreException {
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			sDoc.setPreferredLineDelimiter("\n");
-			String delim = sDoc.getPreferredLineDelimiter();
-			assertEquals("set line delimiter failed", "\n", delim);
-
-			sDoc.setPreferredLineDelimiter("\r\n");
-			delim = sDoc.getPreferredLineDelimiter();
-			assertEquals("set line delimiter failed", "\r\n", delim);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testStringMatches() {
-		// TODO: will need a test when this API is created
-		// IStructuredModel model = getTestModel();
-		// IStructuredDocument sDoc = model.getStructuredDocument();
-	}
-
-	public void testCreatePosition() throws BadPositionCategoryException, BadLocationException, IOException, CoreException {
-		IStructuredModel model = getTestModel();
-		try {
-			IStructuredDocument sDoc = model.getStructuredDocument();
-			Position p = new Position(0, 10);
-			String[] categories = sDoc.getPositionCategories();
-			for (int i = 0; i < categories.length; i++) {
-				sDoc.addPosition(categories[i], p);
-			}
-			int found = 0;
-			for (int i = 0; i < categories.length; i++) {
-				Position[] positions = sDoc.getPositions(categories[i]);
-				for (int j = 0; j < positions.length; j++) {
-					if (positions[j] == p) {
-						found++;
-					}
-				}
-			}
-			assertEquals("wrong number of positions", categories.length, found);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java
deleted file mode 100644
index e57a089b2..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TestXMLDocumentLoader.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.eclipse.wst.xml.core.tests.document;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.osgi.service.datalocation.Location;
-import org.eclipse.wst.xml.core.internal.encoding.XMLDocumentLoader;
-import org.eclipse.wst.xml.core.tests.util.FileUtil;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-public class TestXMLDocumentLoader extends TestCase {
-	
-	private boolean isSetup = false;
-	private final String fProjectName ="DOCUMENT-LOADER";
-	private final String fZipFileName = "xml-document-loader-tests.zip";
-		
-	protected void setUp() throws Exception {
-		super.setUp();
-		if (!this.isSetup) {
-			doSetup();
-			this.isSetup = true;
-		}
-	}
-	
-	private void doSetup() throws Exception {	
-	
-		// root of workspace directory
-		Location platformLocation = Platform.getInstanceLocation();
-		
-		ProjectUnzipUtility unzipUtil = new ProjectUnzipUtility();
-		File zipFile = FileUtil.makeFileFor(ProjectUnzipUtility.PROJECT_ZIPS_FOLDER, fZipFileName, ProjectUnzipUtility.PROJECT_ZIPS_FOLDER);
-		unzipUtil.unzipAndImport(zipFile, platformLocation.getURL().getFile());
-		unzipUtil.initJavaProject(fProjectName);
-	}
-	
-	
-	public void testCreateNewEmptyStructuredDocument() {
-
-		XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
-		IDocument document = null;
-		
-		document = xmlDocumentLoader.createNewStructuredDocument();
-		assertNotNull("failed to create Empty document", document);
-	}
-	
-	public void testCreateNewStructuredDocumentFromFile() {
-		// from a file	
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-			
-		XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
-		IDocument document = null;
-		try {
-			document = xmlDocumentLoader.createNewStructuredDocument(file);
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-		catch (CoreException e) {	
-			e.printStackTrace();
-		}
-		assertNotNull("failed to create document from IFile", document);
-	}
-	
-	public void testCreateNewStructuredDocumentFromInputStream() {
-		String fileLocation = "/files/simple.xml";
-		String absoluteFileLocation = Platform.getInstanceLocation() + fProjectName + fileLocation;
-		
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-		
-		XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
-		IDocument document = null;
-		
-		try {
-			document = xmlDocumentLoader.createNewStructuredDocument(absoluteFileLocation, file.getContents());
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-		catch (CoreException e) {	
-			e.printStackTrace();
-		}
-		assertNotNull("failed to create document from InputStream", document);
-	}
-	
-	public void testCreateNewDocumentFromReaderWithEncodingRule() {
-		
-		String fileLocation = "/files/simple.xml";
-		String absoluteFileLocation = Platform.getInstanceLocation().getURL().getPath().toString() + fProjectName + fileLocation;
-		
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fProjectName + "/files/simple.xml"));
-		
-		XMLDocumentLoader xmlDocumentLoader = new XMLDocumentLoader();
-		IDocument document = null;
-		
-		try {
-			document = xmlDocumentLoader.createNewStructuredDocument(absoluteFileLocation, file.getContents());
-		}
-		catch (IOException e) {
-			e.printStackTrace();
-		}
-		catch (CoreException e) {	
-			e.printStackTrace();
-		}
-		assertNotNull("failed to create document from InputStream with EncodingRule", document);
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java
deleted file mode 100644
index 71a4daa8b..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/TransitionTests.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.xml.core.tests.document;
-
-import java.io.IOException;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentExtension3;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-
-/**
- * @author nsd
- * 
- */
-public class TransitionTests extends UnzippedProjectTester {
-
-	/**
-	 * 
-	 */
-	public TransitionTests() {
-		super();
-	}
-
-
-	public void testSoftRevert() throws CoreException, IOException {
-		String filePath = "testfiles/xml/EmptyFile.xml"; //$NON-NLS-1$
-		IFile file = (IFile) fTestProject.findMember(filePath);
-		assertNotNull("Test Case in error. Could not find file " + filePath, file); //$NON-NLS-1$
-		IPath locationPath = file.getLocation();
-		ITextFileBufferManager bufferManager = FileBuffers.getTextFileBufferManager();
-		bufferManager.connect(locationPath, null);
-		ITextFileBuffer buffer = bufferManager.getTextFileBuffer(locationPath);
-		IDocument document = buffer.getDocument();
-		assertNotNull(document);
-		assertTrue("wrong class of document", document instanceof BasicStructuredDocument); //$NON-NLS-1$
-		assertTrue("wrong partitioner in document.", ((IDocumentExtension3) document).getDocumentPartitioner(IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING) instanceof StructuredTextPartitionerForXML); //$NON-NLS-1$
-
-		IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit((IStructuredDocument) document);
-		try {
-			try {
-				document.replace(0, 0, "__"); //$NON-NLS-1$
-				document.replace(2, 0, "<a"); //$NON-NLS-1$
-				document.replace(4, 0, ">"); //$NON-NLS-1$
-				document.replace(5, 0, "  "); //$NON-NLS-1$
-			}
-			catch (BadLocationException e) {
-				assertNull(e);
-			}
-			document.set(""); //$NON-NLS-1$
-		}
-		finally {
-			model.releaseFromEdit();
-
-			bufferManager.disconnect(locationPath, null);
-		}
-	}
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java
deleted file mode 100644
index c88c54ab0..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/document/UnzippedProjectTester.java
+++ /dev/null
@@ -1,136 +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.xml.core.tests.document;
-
-import java.io.File;
-
-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;
-import org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin;
-import org.eclipse.wst.xml.core.tests.util.ProjectUnzipUtility;
-
-
-/* 
- * Made abstract, so won't be automatically picked up as test (since intended to be subclassed).
- */
-public abstract class UnzippedProjectTester extends TestCase {
-
-	protected static IProject fTestProject;
-	private static boolean fTestProjectInitialized;
-	private static int nSetups = 0;
-	private static final String TEST_PROJECT_NAME = "org.eclipse.wst.sse.core.internal.encoding.newtests";
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		nSetups++;
-		if (!fTestProjectInitialized) {
-			getAndCreateProject();
-			// unzip files to the root of workspace directory
-			String destinationProjectString = fTestProject.getLocation().toOSString();
-			String destinationFolder = destinationProjectString + "/";
-			// this zip file is sitting in the "root" of test plugin
-			File zipFile = SSEModelXMLTestsPlugin.getTestFile("testfiles.zip");
-			ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
-			projUtil.unzipAndImport(zipFile, destinationFolder);
-			projUtil.initJavaProject(TEST_PROJECT_NAME);
-			fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-			fTestProjectInitialized = true;
-		}
-	}
-
-	protected void tearDown() throws Exception {
-		super.tearDown();
-		nSetups--;
-		if (nSetups == 0) {
-			if (!DEBUG) {
-				//				Display display = PlatformUI.getWorkbench().getDisplay();
-				//				display.asyncExec(new Runnable() {
-				//					public void run() {
-				//						ProjectUnzipUtility projUtil = new ProjectUnzipUtility();
-				//						IProject proj = fTestProject;
-				//						fTestProject = null;
-				//						try {
-				//							projUtil.deleteProject(proj);
-				//						} catch (Exception e) {
-				//							e.printStackTrace();
-				//						}
-				//					}
-				//				});
-			}
-		}
-	}
-
-	private static final boolean DEBUG = false;
-
-	private static void getAndCreateProject() throws CoreException {
-		//TestsPlugin testsPlugin = (TestsPlugin)
-		// Platform.getPlugin("org.eclipse.wst.sse.core.internal.encoding.tests");
-		IWorkspace workspace = getWorkspace();
-		IWorkspaceRoot root = workspace.getRoot();
-		fTestProject = root.getProject(TEST_PROJECT_NAME);
-		// this form creates project as "linked" back to 'fileRoot'
-		//createProject(testProject, new Path(fileRoot), null);
-		createProject(fTestProject, null, null);
-		fTestProject.refreshLocal(IResource.DEPTH_INFINITE, null);
-		assertTrue(fTestProject.exists());
-		//		IContainer dotestFiles = testProject.getFolder("dotestFiles");
-		//		assertTrue(dotestFiles.exists());
-		//		IResource[] allFolders = dotestFiles.members();
-		//		assertNotNull(allFolders);
-	}
- 
-	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.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java
deleted file mode 100644
index 20934241f..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/dom/NameValidatorTests.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.core.tests.dom;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.core.internal.provisional.NameValidator;
-
-public class NameValidatorTests extends TestCase {
-
-	private int nTrials = 100;
-
-	public NameValidatorTests(String name) {
-		super(name);
-	}
-
-	private void doTest(int testNumber, String testString, Boolean expectedValidity) {
-		boolean isValid = NameValidator.isValid(testString);
-		assertEquals("testNumber: " + testNumber, expectedValidity.booleanValue(), isValid);
-	}
-	
-	public void testIsValid() {
-		Object[][] testees = new Object[][]{
-					{"initial",Boolean.TRUE},
-					{"foo",Boolean.TRUE},
-					{"4",Boolean.FALSE},
-					{"9999", Boolean.FALSE},
-					{"f9999", Boolean.TRUE},
-					{"", Boolean.FALSE},
-					{"got space", Boolean.FALSE},
-					{" spacebefore", Boolean.FALSE},
-					{"spaceafter ", Boolean.FALSE},
-					{"ns:namespace", Boolean.TRUE},
-					{":funnyns", Boolean.TRUE},
-					/* ISSUE: is "endns:" really valid name */
-					{"endns:", Boolean.TRUE},
-					{"us_underscore", Boolean.TRUE},
-					{"_underscore", Boolean.TRUE},
-					{"underscore_", Boolean.TRUE},
-					{"averylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersizeaverylongnamethatshouldgooverbuffersize", Boolean.TRUE},
-					};
-		for (int i = 0; i < testees.length; i++) {
-			for (int j = 0; j < nTrials; j++) {
-				doTest(i, (String)testees[i][0], (Boolean) testees[i][1]);
-			}
-		}
-	}
-
-}
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java
deleted file mode 100644
index 519d1d6bf..000000000
--- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestFormatProcessorXML.java
+++ /dev/null