This commit was manufactured by cvs2svn to create tag 'v200710121808'.v200710121808

author: nitind 2007-10-12 18:06:50 +0000
committer: nitind 2007-10-12 18:06:50 +0000
commit: 61bcdce73ef31b4d009cafe834d319a5a854f698 (patch)
tree: 4bd09cc8350a817e060adffe59b6bf47a2f165a1
parent: f2d47f45b3b371f2a0acc5f50a9b1893cdbecc2e (diff)
download: webtools.sourceediting.tests-200710121808.tar.gz
webtools.sourceediting.tests-200710121808.tar.xz
webtools.sourceediting.tests-200710121808.zip
1768 files changed, 0 insertions, 109599 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 6c7982ccb..000000000
--- a/features/org.eclipse.wst.web_tests.feature/feature.properties
+++ /dev/null
@@ -1,145 +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\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_tests.feature/feature.xml b/features/org.eclipse.wst.web_tests.feature/feature.xml
deleted file mode 100644
index 7e22fbd5e..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="2.1.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 56445985d..000000000
--- a/features/org.eclipse.wst.web_tests.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI>
-    
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.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 bce1c9126..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=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) 2000, 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_tests.feature/feature.xml b/features/org.eclipse.wst.xml_tests.feature/feature.xml
deleted file mode 100644
index cab39047b..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="2.0.1.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 303e66574..000000000
--- a/features/org.eclipse.wst.xml_tests.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-  
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-  
-  <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/.classpath b/tests/org.eclipse.jst.jsp.core.tests/.classpath
deleted file mode 100644
index ce7393340..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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/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 79ce10e02..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +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.200.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;bundle-version="[3.8.0,4.0.0)",
- 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
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
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 73db36ed5..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>June 06, 2007</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor�s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/build.properties b/tests/org.eclipse.jst.jsp.core.tests/build.properties
deleted file mode 100644
index ebcd3771e..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/build.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-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 93d3d51ea..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 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
-###############################################################################
-# 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 139f20455..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, 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;
-
-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 4cbad6796..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/JSPCoreTestSuite.java
+++ /dev/null
@@ -1,69 +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.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.contentmodels.TestFixedCMDocuments;
-import org.eclipse.jst.jsp.core.tests.contentmodels.TestTaglibCMTests;
-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.JSPActionValidatorTest;
-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");
-
-		String noninteractive = System.getProperty("wtp.autotest.noninteractive");
-		String wtp_autotest_noninteractive = null;
-		if (noninteractive != null)
-			wtp_autotest_noninteractive = noninteractive;
-		System.setProperty("wtp.autotest.noninteractive", "true");
-
-		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 with no file 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"));
-		addTest(new TestSuite(TestFixedCMDocuments.class, "Fixed CMDocument Creation Tests"));
-		addTest(new TestSuite(TestTaglibCMTests.class, "Custom Tag Library Content Model Tests"));
-		addTest(new TestSuite(JSPActionValidatorTest.class, "JSP Action Validator Tests"));
-
-		if (wtp_autotest_noninteractive != null)
-			System.setProperty("wtp.autotest.noninteractive", wtp_autotest_noninteractive);
-	}
-}
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 10dda5f6c..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, 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;
-
-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;
-	}
-
-}
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 58eabf640..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, 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;
-
-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);
-	}
-}
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 183caf93a..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, 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.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"));
-	}
-}
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 794f832ac..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, 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
- *     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 7a4df4182..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, 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.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"));
-	}
-}
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 c1c838e4d..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, 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;
-
-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();
-			}
-		}
-	}
-}
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 6539f3f9d..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, 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;
-
-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);
-
-	}
-
-}
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 db70cfac7..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, 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.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);
-		}
-	}
-}
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 b226517bc..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, 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.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.StructuredFormatPreferencesXML;
-
-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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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();
-		((StructuredFormatPreferencesXML) 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/contentmodels/TestFixedCMDocuments.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestFixedCMDocuments.java
deleted file mode 100644
index c8c4fbd6f..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestFixedCMDocuments.java
+++ /dev/null
@@ -1,91 +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.jst.jsp.core.tests.contentmodels;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.jsp.core.internal.contentmodel.JSPCMDocumentFactory;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-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.provisional.contentmodel.CMDocType;
-
-public class TestFixedCMDocuments extends TestCase {
-	public TestFixedCMDocuments(String name) {
-		super(name);
-	}
-
-	public TestFixedCMDocuments() {
-		super();
-	}
-
-	public static Test suite() {
-		return new TestFixedCMDocuments();
-	}
-
-	public void testCHTMLdocument() {
-		checkDocument(CMDocType.CHTML_DOC_TYPE);
-	}
-
-	private void checkDocument(Object documentKey) {
-		CMDocument document = JSPCMDocumentFactory.getCMDocument(documentKey.toString());
-		assertNotNull("missing doc:" + documentKey.toString(), document);
-		CMNamedNodeMap elements = document.getElements();
-		for (int i = 0; i < elements.getLength(); i++) {
-			CMNode item = elements.item(i);
-			verifyElementDeclarationHasName(item);
-		}
-	}
-
-	private void verifyElementDeclarationHasName(CMNode item) {
-		assertTrue(item.getNodeType() == CMNode.ELEMENT_DECLARATION);
-		assertNotNull("no name on an element declaration", item.getNodeName());
-		CMNamedNodeMap attrs = ((CMElementDeclaration) item).getAttributes();
-		for (int i = 0; i < attrs.getLength(); i++) {
-			CMNode attr = attrs.item(i);
-			verifyAttributeDeclaration(((CMElementDeclaration) item), attr);
-		}
-	}
-
-	private void verifyAttributeDeclaration(CMElementDeclaration elemDecl, CMNode attr) {
-		assertTrue(attr.getNodeType() == CMNode.ATTRIBUTE_DECLARATION);
-		assertNotNull("no name on an attribute declaration", attr.getNodeName());
-		CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) attr;
-		assertNotNull("no attribute 'type' on an attribute declaration " + elemDecl.getNodeName() + "/" + attr.getNodeName(), attrDecl.getAttrType());
-	}
-
-	public void testHTML4document() {
-		checkDocument(CMDocType.HTML_DOC_TYPE);
-	}
-
-	public void testJSP11document() {
-		checkDocument(CMDocType.JSP11_DOC_TYPE);
-
-	}
-
-	public void testJSP12document() {
-		checkDocument(CMDocType.JSP12_DOC_TYPE);
-
-	}
-
-	public void testJSP20document() {
-		checkDocument(CMDocType.JSP20_DOC_TYPE);
-
-	}
-
-	public void testTag20document() {
-		checkDocument(CMDocType.TAG20_DOC_TYPE);
-
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java
deleted file mode 100644
index a98174b83..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/contentmodels/TestTaglibCMTests.java
+++ /dev/null
@@ -1,104 +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.jst.jsp.core.tests.contentmodels;
-
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class TestTaglibCMTests extends TestCase {
-	private static final String TESTFILES_PATHSTRING = "/testfiles/";
-	private static final String PROJECT_NAME = "testLoadTaglibs";
-	private static final String TAG_NAME = "logic:empty";
-
-	public TestTaglibCMTests(String name) {
-		super(name);
-	}
-
-	public TestTaglibCMTests() {
-		super();
-	}
-
-	public static Test suite() {
-		return new TestTaglibCMTests();
-	}
-
-	protected void setUp() throws Exception {
-		super.setUp();
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME);
-		if (!project.exists()) {
-			// Create new project
-			project = BundleResourceUtil.createSimpleProject(PROJECT_NAME, null, null);
-			BundleResourceUtil.copyBundleEntriesIntoWorkspace(TESTFILES_PATHSTRING + PROJECT_NAME, Path.ROOT.append(PROJECT_NAME).toString());
-			BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", Path.ROOT.append(PROJECT_NAME).append("web stuff/WEB-INF/lib/struts.jar").toString());
-			project.refreshLocal(IResource.DEPTH_INFINITE, null);
-			project.build(IncrementalProjectBuilder.FULL_BUILD, null);
-		}
-		assertTrue(project.isAccessible());
-	}
-
-	public void testLoadCustomTagsThroughJSPSyntax() throws IOException, CoreException {
-		IFile jspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(Path.ROOT.append(PROJECT_NAME).append("web stuff/test1.jsp"));
-
-		IDOMModel model = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(jspFile);
-			NodeList presents = model.getDocument().getElementsByTagName(TAG_NAME);
-			assertNotNull(TAG_NAME + " was missing from document", presents.item(0));
-			ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) presents.item(0)).getAdapterFor(ModelQueryAdapter.class);
-			CMElementDeclaration declaration = modelQueryAdapter.getModelQuery().getCMElementDeclaration((Element) presents.item(0));
-			assertNotNull("no CMElementDelcaration for " + TAG_NAME, declaration);
-			assertEquals("qualified name from element declaration was different", declaration.getNodeName(), TAG_NAME);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void testLoadCustomTagsThroughXMLSyntax() throws IOException, CoreException {
-		IFile jspFile = ResourcesPlugin.getWorkspace().getRoot().getFile(Path.ROOT.append(PROJECT_NAME).append("web stuff/testX.jsp"));
-
-		IDOMModel model = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(jspFile);
-			NodeList presents = model.getDocument().getElementsByTagName(TAG_NAME);
-			assertNotNull(TAG_NAME + " was missing from document", presents.item(0));
-			ModelQueryAdapter modelQueryAdapter = (ModelQueryAdapter) ((INodeNotifier) presents.item(0)).getAdapterFor(ModelQueryAdapter.class);
-			CMElementDeclaration declaration = modelQueryAdapter.getModelQuery().getCMElementDeclaration((Element) presents.item(0));
-			assertNotNull("no CMElementDelcaration for " + TAG_NAME, declaration);
-			assertEquals("qualified name from element declaration was different", declaration.getNodeName(), TAG_NAME);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromEdit();
-			}
-		}
-	}
-}
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 ff92ba27f..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, 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.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));
-	}
-
-}
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 97a8702db..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, 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.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());
-	}
-
-
-}
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 74e69ee44..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, 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.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 71105b591..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, 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.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();
-	}
-}
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 037739258..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/model/TestModelAdapters.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.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;
-
-/**
- * @deprecated - we don't have INodeAdapters directly on our models and this
- *             is not part of the usual test suite (test.xml)
- */
-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 a908c51d3..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, 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.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();
-		}
-	}
-}
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 76f539c53..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, 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.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 04aec4006..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, 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.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;
-	}
-}
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 7fc624d91..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/source/JSPTokenizerTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.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 aed8eff43..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/BundleResourceUtil.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 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.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) {
-			IPath path = new Path(fullPath);
-//			for (int j = 1; j <= path.segmentCount() - 2; j++) {
-//				IPath folderPath = path.removeLastSegments(path.segmentCount() - j);
-//				IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(folderPath);
-//				if (!folder.exists()) {
-//					folder.create(true, true, 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(path);
-				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();
-			}
-		}
-		else {
-			System.err.println("can't find " + entryname);
-		}
-		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 7b2ffef2a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/taglibindex/TestIndex.java
+++ /dev/null
@@ -1,419 +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.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.internal.contentmodel.tld.provisional.TLDDocument;
-import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDElementDeclaration;
-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;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.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;
-import org.w3c.dom.NodeList;
-
-/**
- * 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 testAvailableAfterAddingJARToBuildPath() 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);
-		assertNull("unexpected 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("expected record missing 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 testAvailableAfterCopyingJARIntoProject() 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("unexpected 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).getDescriptor().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 testAvailableAfterCopyingJARIntoProject2() 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("unexpected 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).getDescriptor().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 testUtilityProjectSupport() throws Exception {
-		// Create project 1
-		IProject project = BundleResourceUtil.createSimpleProject("test-jar", null, null);
-		assertTrue(project.exists());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug183756/test-jar", "/test-jar");
-
-		// Create project 2
-		IProject project2 = BundleResourceUtil.createSimpleProject("test-war", null, null);
-		assertTrue(project2.exists());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/bug183756/test-war", "/test-war");
-
-		IFile testFile = project2.getFile(new Path("src/main/webapp/test.jsp"));
-		assertTrue("missing test JSP file!", testFile.isAccessible());
-
-		IDOMModel jspModel = null;
-		try {
-			jspModel = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(testFile);
-			NodeList tests = jspModel.getDocument().getElementsByTagName("test:test");
-			assertTrue("test:test element not found", tests.getLength() > 0);
-			CMElementDeclaration elementDecl = ModelQueryUtil.getModelQuery(jspModel).getCMElementDeclaration(((Element) tests.item(0)));
-			assertNotNull("No element declaration was found for test:test at runtime", elementDecl);
-			assertTrue("element declaration was not the expected kind", elementDecl instanceof CMNodeWrapper);
-			CMNode originNode = ((CMNodeWrapper) elementDecl).getOriginNode();
-			assertTrue("element declaration was not from a tag library", originNode instanceof TLDElementDeclaration);
-			assertEquals("element declaration was not from expected tag library", "http://foo.com/testtags", ((TLDDocument) ((TLDElementDeclaration) originNode).getOwnerDocument()).getUri());
-		}
-		finally {
-			if (jspModel != null) {
-				jspModel.releaseFromRead();
-			}
-		}
-	}
-	
-	public void testWebXMLTaglibMappingsToJARs() 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).getDescriptor().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).getDescriptor().getURI());
-	}
-
-	/**
-	 * test caching from session-to-session
-	 */
-	public void testRecordCacheCountBetweenSessions() 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 testAvailableFromExportedOnBuildpathFromAnotherProject() 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", 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);
-	}
-}
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 b9705b790..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 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.jst.jsp.core.tests.translation;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.jsp.core.internal.JSPCorePlugin;
-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.internal.preferences.JSPCorePreferenceNames;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestsPlugin;
-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.validation.internal.operations.ValidatorManager;
-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();
-	}
-
-	// public void testMangling() {
-	// assertEquals("simple_tag", JSP2ServletNameUtil.mangle("simple.tag"));
-	// assertEquals("simple_jspf", JSP2ServletNameUtil.mangle("simple.jspf"));
-	// assertEquals("sim_005f_005fple_tagx",
-	// JSP2ServletNameUtil.mangle("sim__ple.tagx"));
-	// assertEquals(new Path("Project.folder.simple_tag"),
-	// JSP2ServletNameUtil.mangle(new Path("/Project/folder/simple.tag")));
-	// assertEquals(new Path("Project.fold_005fer.simple_jspx"),
-	// JSP2ServletNameUtil.mangle(new Path("/Project/fold_er/simple.jspx")));
-	// }
-	//
-	// public void testUnmangling() {
-	// assertEquals("simple.tag", JSP2ServletNameUtil.unmangle("simple_tag"));
-	// assertEquals("simple.jspf",
-	// JSP2ServletNameUtil.unmangle("simple_jspf"));
-	// assertEquals("sim__ple.tagx",
-	// JSP2ServletNameUtil.unmangle("sim_005f_005fple_tagx"));
-	// assertEquals(new Path("/Project/folder/simple.tag"),
-	// JSP2ServletNameUtil.unmangle(new Path("Project.folder.simple_tag")));
-	// assertEquals(new Path("/Project/fold_er/simple.jspx"),
-	// JSP2ServletNameUtil.unmangle(new
-	// Path("Project.fold_005fer.simple_jspx")));
-	// }
-	public void test_174042() throws Exception {
-		boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
-		String testName = "bug_174042";
-		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject(testName, null, null);
-		assertTrue(project.exists());
-		JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-		BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/struts.jar");
-		waitForBuildAndValidation(project);
-		JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
-		IFile main = project.getFile("main.jsp");
-		IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
-		StringBuffer s = new StringBuffer();
-		for (int i = 0; i < markers.length; i++) {
-			s.append("\nproblem marker on line " + markers[i].getAttribute(IMarker.LINE_NUMBER) + ": \"" + markers[i].getAttribute(IMarker.MESSAGE) + "\" ");
-		}
-		assertEquals("problem markers found, " + s.toString(), 0, markers.length);
-	}
-
-	private void waitForBuildAndValidation(IProject project) throws CoreException {
-		project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
-		project.build(IncrementalProjectBuilder.FULL_BUILD, "org.eclipse.wst.validation.validationbuilder", null, new NullProgressMonitor());
-		project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
-		try {
-			ResourcesPlugin.getWorkspace().checkpoint(true);
-			Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());
-			Job.getJobManager().join(ResourcesPlugin.FAMILY_MANUAL_BUILD, new NullProgressMonitor());
-			Job.getJobManager().join(ValidatorManager.VALIDATOR_JOB_FAMILY, new NullProgressMonitor());
-			Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());
-			Job.getJobManager().beginRule(ResourcesPlugin.getWorkspace().getRoot(), null);
-		}
-		catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-		catch (OperationCanceledException e) {
-			e.printStackTrace();
-		}
-		finally {
-			Job.getJobManager().endRule(ResourcesPlugin.getWorkspace().getRoot());
-		}
-	}
-
-	public void test_178443() throws Exception {
-		boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
-		String testName = "bug_178443";
-		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject(testName, Platform.getStateLocation(JSPCoreTestsPlugin.getDefault().getBundle()).append(testName), null);
-		assertTrue(project.exists());
-		/*
-		 * Should be set to false. A referenced class in an included segment
-		 * does not exist.
-		 */
-		JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-		BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/struts.jar");
-
-		waitForBuildAndValidation(project);
-		
-		JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
-		IFile main = project.getFile("main.jsp");
-		IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
-
-		StringBuffer s = new StringBuffer();
-		for (int i = 0; i < markers.length; i++) {
-			s.append("\nproblem on line " + markers[i].getAttribute(IMarker.LINE_NUMBER) + ": " + markers[i].getAttribute(IMarker.MESSAGE));
-		}
-		assertEquals("problem markers found" + s.toString(), 0, markers.length);
-	}
-
-	public void test_109721() throws Exception {
-		boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
-		String testName = "bug_109721";
-		// Create new project
-		IProject project = BundleResourceUtil.createSimpleProject(testName, Platform.getStateLocation(JSPCoreTestsPlugin.getDefault().getBundle()).append(testName), null);
-		assertTrue(project.exists());
-		/*
-		 * Should be set to false. A referenced class in an included segment
-		 * does not exist.
-		 */
-		JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, false);
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-		BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/WebContent/WEB-INF/lib/struts.jar");
-
-		waitForBuildAndValidation(project);
-
-		JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
-		IFile main = project.getFile("WebContent/main.jsp");
-		IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
-		
-		StringBuffer s = new StringBuffer();
-		for (int i = 0; i < markers.length; i++) {
-			s.append("\nproblem on line " + markers[i].getAttribute(IMarker.LINE_NUMBER) + ": " + markers[i].getAttribute(IMarker.MESSAGE));
-		}
-		assertEquals("problem markers found" + s.toString(), 0, markers.length);
-	}
-	public void test_181057a() throws Exception {
-		boolean doValidateSegments = JSPCorePlugin.getDefault().getPluginPreferences().getBoolean(JSPCorePreferenceNames.VALIDATE_FRAGMENTS);
-		String testName = "bug_181057";
-		// Create new project
-		IProject j = BundleResourceUtil.createSimpleProject("j", null, null);
-		assertTrue(j.exists());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/j", "/j");
-		IProject k = BundleResourceUtil.createSimpleProject("k", null, null);
-		assertTrue(k.exists());
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/k", "/k");
-
-		IProject project = BundleResourceUtil.createSimpleProject(testName, Platform.getStateLocation(JSPCoreTestsPlugin.getDefault().getBundle()).append(testName), null);
-		assertTrue(project.exists());
-		JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, true);
-		BundleResourceUtil.copyBundleEntriesIntoWorkspace("/testfiles/" + testName, "/" + testName);
-		BundleResourceUtil.copyBundleEntryIntoWorkspace("/testfiles/struts.jar", "/" + testName + "/struts.jar");
-
-		waitForBuildAndValidation(project);
-
-		JSPCorePlugin.getDefault().getPluginPreferences().setValue(JSPCorePreferenceNames.VALIDATE_FRAGMENTS, doValidateSegments);
-		/*
-		 * main.jsp contains numerous references to tags in struts.jar, which
-		 * is at the end of the build path
-		 */
-		IFile main = project.getFile("main.jsp");
-		IMarker[] markers = main.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
-		StringBuffer s = new StringBuffer();
-		for (int i = 0; i < markers.length; i++) {
-			s.append("\n" + markers[i].getAttribute(IMarker.LINE_NUMBER) + ":" + markers[i].getAttribute(IMarker.MESSAGE));
-		}
-		assertEquals("problem markers found" + s.toString(), 0, markers.length);
-	}
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java
deleted file mode 100644
index 31302a4db..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/validation/JSPActionValidatorTest.java
+++ /dev/null
@@ -1,131 +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.jst.jsp.core.tests.validation;
-
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-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.JSPCoreMessages;
-import org.eclipse.jst.jsp.core.internal.validation.JSPActionValidator;
-import org.eclipse.jst.jsp.core.tests.taglibindex.BundleResourceUtil;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-
-public class JSPActionValidatorTest extends TestCase {
-	String wtp_autotest_noninteractive = null;
-	private static final String PROJECT_NAME = "testvalidatejspactions";
-	private static final String UNDEFINED_ATTR_IDONT = "idont";
-	private static final String REQUIRED_ATTR_NAME = "name";
-
-	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 unknown attributes are detected
-	 * 
-	 * @throws Exception
-	 */
-	public void testUknownAttribute() throws Exception {
-		JSPActionValidator validator = new JSPActionValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/undefinedattribute.jsp";
-		assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
-		helper.setURI(filePath);
-		validator.validate(helper, reporter);
-
-		boolean foundError1 = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_6, UNDEFINED_ATTR_IDONT), 4);
-		if (foundError1)
-			foundError1 = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_6, UNDEFINED_ATTR_IDONT), 12);
-		if (foundError1)
-			foundError1 = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_6, UNDEFINED_ATTR_IDONT), 13);
-
-		assertTrue("jsp action validator did not detect undefined attributes", foundError1);
-	}
-
-	/**
-	 * Tests if missing required attributes are detected
-	 * 
-	 * @throws Exception
-	 */
-	public void testMissingRequiredAttribute() throws Exception {
-		JSPActionValidator validator = new JSPActionValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/norequiredattribute.jsp";
-		assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
-
-		helper.setURI(filePath);
-		validator.validate(helper, reporter);
-
-		boolean foundError = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_5, REQUIRED_ATTR_NAME), 11);
-		if (foundError)
-			foundError = errorMessageFound(reporter, NLS.bind(JSPCoreMessages.JSPDirectiveValidator_5, REQUIRED_ATTR_NAME), 12);
-
-		assertTrue("jsp action validator did not detect missing required attributes", foundError);
-	}
-	
-	private boolean errorMessageFound(IReporter reporter, String errorMessage, int errorLineNumber) {
-		boolean foundError = false;
-		List messages = reporter.getMessages();
-		Iterator iter = messages.iterator();
-		while (iter.hasNext() && !foundError) {
-			IMessage message = (IMessage) iter.next();
-			int lineNumber = message.getLineNumber();
-			String messageText = message.getText();
-
-			if (lineNumber == errorLineNumber && messageText.startsWith(errorMessage))
-				foundError = true;
-		}
-		return foundError;
-	}
-
-	/**
-	 * Tests if missing required attributes are detected
-	 * 
-	 * @throws Exception
-	 */
-	public void testAttributesCorrect() throws Exception {
-		JSPActionValidator validator = new JSPActionValidator();
-		IReporter reporter = new ReporterForTest();
-		ValidationContextForTest helper = new ValidationContextForTest();
-		String filePath = "/" + PROJECT_NAME + "/WebContent/worksfine.jsp";
-		assertTrue("unable to find file: " + filePath, ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(filePath)).exists());
-
-		helper.setURI(filePath);
-		validator.validate(helper, reporter);
-
-		assertTrue("jsp action validator found errors when it should not have", reporter.getMessages().isEmpty());
-	}
-}
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/bug183756/test-jar/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.classpath
deleted file mode 100644
index d5aec8fe2..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.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/org.eclipse.jst.server.tomcat.runtimeTarget/Tomcat 5.5.9"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.project
deleted file mode 100644
index 80341f8f1..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>test-jar</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<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>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</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/bug183756/test-jar/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 167796c4c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Apr 24 11:16:26 BST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 0bb9d1797..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="test-jar">
-        <wb-resource deploy-path="/" source-path="/src"/>
-<property name="ear_libraries_processed" value="true"/>
-    </wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index fd534a952..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="jst.utility"/>
-  <fixed facet="jst.java"/>
-  <installed facet="jst.java" version="6.0"/>
-  <installed facet="jst.utility" version="1.0"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/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/bug183756/test-jar/bin/META-INF/taglib.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/taglib.tld
deleted file mode 100644
index af3a82be7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/META-INF/taglib.tld
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
-<taglib>
-	<tlib-version>1.0</tlib-version>
-	<jsp-version>1.2</jsp-version>
-	<short-name>test</short-name>
-	<uri>http://foo.com/testtags</uri>
-	<description>Test Tag Library</description>
-
-
-	<tag>
-		<name>test</name>
-		<tag-class>com.foo.TestTag</tag-class>
-		<body-content>empty</body-content>
-		<description>
-			test
-		</description>
-	</tag>
-	
-</taglib>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/com/foo/TestTag.class b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/com/foo/TestTag.class
deleted file mode 100644
index 7cf9d8824..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/bin/com/foo/TestTag.class
+++ /dev/null
@@ -1,15 +0,0 @@
-����???2?,??com/foo/TestTag??#javax/servlet/jsp/tagext/TagSupport?<init>?()V?Code
-??	???LineNumberTable?LocalVariableTable?this?Lcom/foo/TestTag;?
-doStartTag?()I?
-Exceptions??javax/servlet/jsp/JspException	?????pageContext?Ljavax/servlet/jsp/PageContext;
-????javax/servlet/jsp/PageContext???getOut?()Ljavax/servlet/jsp/JspWriter;??
-TAG WORKED
-? ?"?!?javax/servlet/jsp/JspWriter?#?$?write?(Ljava/lang/String;)V
-??&???(?java/lang/Exception?
-StackMapTable?
-SourceFile?TestTag.java?!???????????????/?????*�?�????
-?????????????????
-????????????????\?????*�?�?�?�?L*�?%�??????'??
-???????
-??????????????
-???)????O?'???*????+
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/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/bug183756/test-jar/src/META-INF/taglib.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/taglib.tld
deleted file mode 100644
index af3a82be7..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/META-INF/taglib.tld
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
-<taglib>
-	<tlib-version>1.0</tlib-version>
-	<jsp-version>1.2</jsp-version>
-	<short-name>test</short-name>
-	<uri>http://foo.com/testtags</uri>
-	<description>Test Tag Library</description>
-
-
-	<tag>
-		<name>test</name>
-		<tag-class>com.foo.TestTag</tag-class>
-		<body-content>empty</body-content>
-		<description>
-			test
-		</description>
-	</tag>
-	
-</taglib>
-
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/com/foo/TestTag.java b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/com/foo/TestTag.java
deleted file mode 100644
index 951882c60..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-jar/src/com/foo/TestTag.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.foo;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-
-public class TestTag extends TagSupport {
-
-	public int doStartTag() throws JspException {
-		try {
-		pageContext.getOut().write("TAG WORKED");
-		} catch (Exception e) {
-			
-		}
-		return super.doStartTag();
-	}
-
-}
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.classpath
deleted file mode 100644
index edb36ca0c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<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 exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="output" path="build/classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.project
deleted file mode 100644
index eb5941633..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>test-war</name>
-	<comment></comment>
-	<projects>
-		<project>test-jar</project>
-	</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/bug183756/test-war/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 84f2b1999..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Apr 24 11:08:40 BST 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jst.common.project.facet.core.prefs b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jst.common.project.facet.core.prefs
deleted file mode 100644
index 43db39ab9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.jst.common.project.facet.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Apr 24 11:08:46 BST 2007
-classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.6.0_01/owners=jst.java\:6.0
-classpath.helper/org.eclipse.jst.server.core.container\:\:org.eclipse.jst.server.tomcat.runtimeTarget\:\:Apache\ Tomcat\ v4.1/owners=jst.web\:2.3
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.component b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 2c1da55d5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="test-war">
-        <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/test-jar/test-jar">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <property name="context-root" value="test-war"/>
-        <property name="java-output-path" value="build/classes"/>
-<property name="web_app_libraries_processed" value="true"/>
-<property name="ear_libraries_processed" value="true"/>
-    </wb-module>
-</project-modules>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.project.facet.core.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index dd3b08413..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/.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 v4.1"/>
-  <fixed facet="jst.java"/>
-  <fixed facet="jst.web"/>
-  <installed facet="jst.java" version="6.0"/>
-  <installed facet="jst.web" version="2.3"/>
-</faceted-project>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 254272e1c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/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/bug183756/test-war/src/main/webapp/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 47cea3c49..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app id="WebApp_ID">
-	<display-name>test-war</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/bug183756/test-war/src/main/webapp/test.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/test.jsp
deleted file mode 100644
index d3f943691..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug183756/test-war/src/main/webapp/test.jsp
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%>
-<%@ taglib uri="http://foo.com/testtags" prefix="test" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Test</title>
-</head>
-<body>
-Before Tag
-<test:test/>
-After Tag
-</body>
-</html>
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_109721/.classpath b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.classpath
deleted file mode 100644
index 4600e2b0b..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.classpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="lib" path="WebContent/WEB-INF/lib/struts.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_08"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.project b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.project
deleted file mode 100644
index 770dfe43c..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/.project
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>bug_109721</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/bug_109721/WebContent/WEB-INF/lib/.keepme b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/lib/.keepme
deleted file mode 100644
index e69de29bb..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/lib/.keepme
+++ /dev/null
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/web.xml b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/web.xml
deleted file mode 100644
index 34906a0e5..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,18 +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>
-	TagTest</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>
-	<jsp-config>
-		<jsp-property-group>
-			<url-pattern>*.jsp</url-pattern>
-			<include-prelude>/header.jspf</include-prelude>
-		</jsp-property-group></jsp-config>
-</web-app>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/header.jspf b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/header.jspf
deleted file mode 100644
index 4dc2f5bd9..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/header.jspf
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib prefix="logic" uri="http://jakarta.apache.org/struts/tags-logic"%>
-<%! int alpha = 5; %>
-<%@ taglib prefix="bean" uri="http://jakarta.apache.org/struts/tags-bean"%>
-
-<%  %>
diff --git a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/main.jsp b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/main.jsp
deleted file mode 100644
index 5d094dc1a..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_109721/WebContent/main.jsp
+++ /dev/null
@@ -1,14 +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" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-<!-- note: the directive for bean exists in header.jspf as specified in the web.xml file -->
-<bean:define id="foo" ></bean:define>
-<%=alpha%>
-</body>
-</html>
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/libtags.tld b/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/libtags.tld
deleted file mode 100644
index fbabe44db..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/WebContent/WEB-INF/tld/libtags.tld
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<taglib>
-	<tlibversion>1.2</tlibversion>
-	<jspversion>1.1</jspversion>
-	<shortname>libtags</shortname>
-	<uri>http://nothing.com/libtags</uri>
-	<tag>
-		<name>ihaveattrs</name>
-		<tagclass>nothing.taglib.ihaveattrs</tagclass>
-		<bodycontent>JSP</bodycontent>
-		<attribute>
-			<name>name</name>
-			<required>false</required>
-		</attribute>
-		<attribute>
-			<name>scope</name>
-			<required>false</required>
-		</attribute>
-	</tag>
-	<tag>
-		<name>ireqattrs</name>
-		<tagclass>nothing.taglib.ireqattrs</tagclass>
-		<bodycontent>JSP</bodycontent>
-		<attribute>
-			<name>name</name>
-			<required>true</required>
-		</attribute>
-		<attribute>
-			<name>scope</name>
-			<required>false</required>
-		</attribute>
-	</tag>
-	<tag>
-		<name>emptyme</name>
-		<tagclass>nothing.taglib.emptyme</tagclass>
-		<bodycontent>JSP</bodycontent>
-	</tag>
-</taglib>
-\ No newline at end of file
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 62ebcc80d..000000000
--- a/tests/org.eclipse.jst.jsp.core.tests/testfiles/bug_118251-e/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>testvalidatejspactions</display-name>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.htm</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
author	nitind	2007-10-12 18:06:50 +0000
committer	nitind	2007-10-12 18:06:50 +0000
commit	61bcdce73ef31b4d009cafe834d319a5a854f698 (patch)
tree	4bd09cc8350a817e060adffe59b6bf47a2f165a1
parent	f2d47f45b3b371f2a0acc5f50a9b1893cdbecc2e (diff)
download	webtools.sourceediting.tests-200710121808.tar.gz webtools.sourceediting.tests-200710121808.tar.xz webtools.sourceediting.tests-200710121808.zip